Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jk/maint-1.6.3-ls-files-i' | Junio C Hamano | 2009-11-10 |
|\ | |||
| * | ls-files: unbreak "ls-files -i" | Jeff King | 2009-10-30 |
* | | Merge branch 'bg/merge-ff-only' | Junio C Hamano | 2009-11-10 |
|\ \ | |||
| * | | Teach 'git merge' and 'git pull' the option --ff-only | Björn Gustavsson | 2009-10-30 |
* | | | Merge branch 'jp/dirty-describe' | Junio C Hamano | 2009-11-10 |
|\ \ \ | |||
| * | | | Teach "git describe" --dirty option | Jean Privat | 2009-10-27 |
* | | | | Merge branch 'jc/commit-s-subject-is-not-a-footer' | Junio C Hamano | 2009-11-06 |
|\ \ \ \ | |||
| * | | | | builtin-commit.c: fix logic to omit empty line before existing footers | Junio C Hamano | 2009-11-06 |
| | |/ / | |/| | | |||
* | | | | Merge branch 'jn/show-normalized-refs' | Junio C Hamano | 2009-11-02 |
|\ \ \ \ | |||
| * | | | | t1402: Make test executable | Stephen Boyd | 2009-11-02 |
* | | | | | fixup tr/stash-format merge | Junio C Hamano | 2009-10-30 |
|\ \ \ \ \ | |||
| * | | | | | Introduce new pretty formats %g[sdD] for reflog information | Thomas Rast | 2009-10-19 |
* | | | | | | Merge branch 'js/diff-verbose-submodule' | Junio C Hamano | 2009-10-30 |
|\ \ \ \ \ \ | |||
| * | | | | | | add tests for git diff --submodule | Jens Lehmann | 2009-10-23 |
* | | | | | | | Merge branch 'jn/show-normalized-refs' | Junio C Hamano | 2009-10-30 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| * | | | | | | git check-ref-format --print | Junio C Hamano | 2009-10-12 |
| * | | | | | | Add tests for git check-ref-format | Jonathan Nieder | 2009-10-12 |
| | |_|_|/ / | |/| | | | | |||
* | | | | | | t915{0,1}: use $TEST_DIRECTORY | Jeff King | 2009-10-30 |
* | | | | | | Make t9150 and t9151 test scripts executable | Michael J Gruber | 2009-10-30 |
| |_|_|/ / |/| | | | | |||
* | | | | | commit: More generous accepting of RFC-2822 footer lines. | David Brown | 2009-10-28 |
* | | | | | git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parents | Sam Vilain | 2009-10-26 |
* | | | | | git-svn: add test data for SVN 1.5+ merge, with script. | Sam Vilain | 2009-10-26 |
* | | | | | git-svn: convert SVK merge tickets to extra parents | Sam Vilain | 2009-10-26 |
* | | | | | git-svn: allow test setup script to support PERL env. var | Sam Vilain | 2009-10-26 |
* | | | | | git-svn: add test data for SVK merge, with script. | Sam Vilain | 2009-10-26 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2009-10-25 |
|\ \ \ \ \ | |||
| * | | | | | t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test | Markus Heidelberg | 2009-10-24 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-10-23 |
|\ \ \ \ \ \ | |/ / / / / | |||
| * | | | | | Merge branch 'jp/maint-send-email-fold' into maint | Junio C Hamano | 2009-10-23 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'pv/maint-add-p-no-exclude' into maint | Junio C Hamano | 2009-10-23 |
| |\ \ \ \ \ \ | |||
| * | | | | | | | Do not fail "describe --always" in a tag-less repository | Junio C Hamano | 2009-10-23 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-10-21 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||
| * | | | | | | | Mark files in t/t5100 as UTF-8 | Johannes Sixt | 2009-10-21 |
| * | | | | | | | Remove a left-over file from t/t5100 | Johannes Sixt | 2009-10-21 |
* | | | | | | | | Merge branch 'bg/rebase-reword' | Junio C Hamano | 2009-10-19 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | Teach 'rebase -i' the command "reword" | Björn Gustavsson | 2009-10-07 |
| | |_|_|_|/ / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'jp/maint-send-email-fold' | Junio C Hamano | 2009-10-18 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||
| * | | | | | | | git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT... | Joe Perches | 2009-10-09 |
* | | | | | | | | Merge branch 'cc/replace-no-replace' | Junio C Hamano | 2009-10-18 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | git: add --no-replace-objects option to disable replacing | Christian Couder | 2009-10-13 |
| | |_|_|_|/ / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached' | Junio C Hamano | 2009-10-18 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||
| * | | | | | | | ls-files: excludes should not impact tracked files | Jeff King | 2009-10-12 |
* | | | | | | | | Merge branch 'jc/maint-blank-at-eof' | Junio C Hamano | 2009-10-17 |
|\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a... | Junio C Hamano | 2009-09-15 |
| |\ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | diff --whitespace: fix blank lines at end | Junio C Hamano | 2009-09-14 |
| | * | | | | | | | | diff --color: color blank-at-eof | Junio C Hamano | 2009-09-04 |
| | * | | | | | | | | diff --whitespace=warn/error: fix blank-at-eof check | Junio C Hamano | 2009-09-04 |
| | * | | | | | | | | diff --whitespace=warn/error: obey blank-at-eof | Junio C Hamano | 2009-09-04 |
| | * | | | | | | | | apply --whitespace: warn blank but not necessarily empty lines at EOF | Junio C Hamano | 2009-09-04 |
| | * | | | | | | | | apply --whitespace=warn/error: diagnose blank at EOF | Junio C Hamano | 2009-09-04 |