Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Do not use VISUAL editor on dumb terminals | Jonathan Nieder | 2009-11-13 | 3 | -8/+18 |
* | commit: More generous accepting of RFC-2822 footer lines. | David Brown | 2009-10-28 | 1 | -0/+41 |
* | git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parents | Sam Vilain | 2009-10-26 | 1 | -0/+21 |
* | git-svn: add test data for SVN 1.5+ merge, with script. | Sam Vilain | 2009-10-26 | 3 | -0/+811 |
* | git-svn: convert SVK merge tickets to extra parents | Sam Vilain | 2009-10-26 | 1 | -0/+23 |
* | git-svn: allow test setup script to support PERL env. var | Sam Vilain | 2009-10-26 | 1 | -2/+3 |
* | git-svn: add test data for SVK merge, with script. | Sam Vilain | 2009-10-26 | 2 | -0/+673 |
* | Merge branch 'maint' | Junio C Hamano | 2009-10-25 | 1 | -1/+1 |
|\ | |||||
| * | t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test | Markus Heidelberg | 2009-10-24 | 1 | -1/+1 |
* | | Merge branch 'maint' | Junio C Hamano | 2009-10-23 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | Merge branch 'jp/maint-send-email-fold' into maint | Junio C Hamano | 2009-10-23 | 1 | -20/+74 |
| |\ | |||||
| * \ | Merge branch 'pv/maint-add-p-no-exclude' into maint | Junio C Hamano | 2009-10-23 | 1 | -0/+14 |
| |\ \ | |||||
| * | | | Do not fail "describe --always" in a tag-less repository | Junio C Hamano | 2009-10-23 | 1 | -0/+2 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2009-10-21 | 2 | -35/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | Mark files in t/t5100 as UTF-8 | Johannes Sixt | 2009-10-21 | 1 | -0/+4 |
| * | | | Remove a left-over file from t/t5100 | Johannes Sixt | 2009-10-21 | 1 | -35/+0 |
* | | | | Merge branch 'bg/rebase-reword' | Junio C Hamano | 2009-10-19 | 2 | -3/+17 |
|\ \ \ \ | |||||
| * | | | | Teach 'rebase -i' the command "reword" | Björn Gustavsson | 2009-10-07 | 2 | -3/+17 |
* | | | | | Merge branch 'jp/maint-send-email-fold' | Junio C Hamano | 2009-10-18 | 1 | -20/+74 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT... | Joe Perches | 2009-10-09 | 1 | -20/+74 |
* | | | | | Merge branch 'cc/replace-no-replace' | Junio C Hamano | 2009-10-18 | 1 | -0/+7 |
|\ \ \ \ \ | |||||
| * | | | | | git: add --no-replace-objects option to disable replacing | Christian Couder | 2009-10-13 | 1 | -0/+7 |
* | | | | | | Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached' | Junio C Hamano | 2009-10-18 | 1 | -0/+32 |
|\ \ \ \ \ \ | |||||
| * | | | | | | ls-files: excludes should not impact tracked files | Jeff King | 2009-10-12 | 1 | -0/+32 |
* | | | | | | | Merge branch 'jc/maint-blank-at-eof' | Junio C Hamano | 2009-10-17 | 3 | -3/+110 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a... | Junio C Hamano | 2009-09-15 | 3 | -3/+110 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | diff --whitespace: fix blank lines at end | Junio C Hamano | 2009-09-14 | 1 | -1/+1 |
| | * | | | | | | | diff --color: color blank-at-eof | Junio C Hamano | 2009-09-04 | 1 | -0/+9 |
| | * | | | | | | | diff --whitespace=warn/error: fix blank-at-eof check | Junio C Hamano | 2009-09-04 | 1 | -0/+7 |
| | * | | | | | | | diff --whitespace=warn/error: obey blank-at-eof | Junio C Hamano | 2009-09-04 | 2 | -3/+3 |
| | * | | | | | | | apply --whitespace: warn blank but not necessarily empty lines at EOF | Junio C Hamano | 2009-09-04 | 1 | -0/+13 |
| | * | | | | | | | apply --whitespace=warn/error: diagnose blank at EOF | Junio C Hamano | 2009-09-04 | 1 | -0/+26 |
| | * | | | | | | | apply --whitespace=fix: detect new blank lines at eof correctly | Junio C Hamano | 2009-09-04 | 1 | -0/+24 |
| | * | | | | | | | apply --whitespace=fix: fix handling of blank lines at the eof | Junio C Hamano | 2009-09-04 | 1 | -0/+29 |
| | * | | | | | | | Merge branch 'maint-1.5.6' into maint-1.6.0 | Junio C Hamano | 2009-08-27 | 1 | -0/+39 |
| | |\ \ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ \ | Merge branch 'maint' | Junio C Hamano | 2009-10-17 | 1 | -0/+66 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'maint-1.6.4' into maint | Junio C Hamano | 2009-10-16 | 1 | -0/+66 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | grep: do not segfault when -f is used | Matt Kraai | 2009-10-16 | 1 | -0/+66 |
| | | |_|_|_|_|/ / / | | |/| | | | | | | | |||||
* | | | | | | | | | | Merge branch 'pv/maint-add-p-no-exclude' | Junio C Hamano | 2009-10-14 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | git-add--interactive: never skip files included in index | Pauli Virtanen | 2009-10-10 | 1 | -0/+14 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-10-14 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | sha1_file: Fix infinite loop when pack is corrupted | Shawn O. Pearce | 2009-10-14 | 1 | -0/+9 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Let --decorate show HEAD position | Thomas Rast | 2009-10-12 | 2 | -2/+2 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'rs/maint-archive-prefix' | Junio C Hamano | 2009-10-09 | 1 | -0/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Git archive and trailing "/" in prefix | René Scharfe | 2009-10-08 | 1 | -0/+12 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-10-04 | 1 | -0/+8 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Merge branch 'jc/maint-1.6.4-show-branch-default' into maint | Junio C Hamano | 2009-10-04 | 1 | -0/+8 |
| |\ \ \ \ \ | |||||
| | * | | | | | show-branch: fix segfault when showbranch.default exists | Junio C Hamano | 2009-10-04 | 1 | -0/+8 |
| * | | | | | | Merge branch 'jc/maint-unpack-objects-strict' into maint | Junio C Hamano | 2009-09-16 | 1 | -0/+35 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/maint-1.6.3-checkout-unborn' into maint | Junio C Hamano | 2009-09-16 | 1 | -0/+40 |
| |\ \ \ \ \ \ \ |