summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Do not use VISUAL editor on dumb terminalsJonathan Nieder2009-11-133-8/+18
* commit: More generous accepting of RFC-2822 footer lines.David Brown2009-10-281-0/+41
* git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parentsSam Vilain2009-10-261-0/+21
* git-svn: add test data for SVN 1.5+ merge, with script.Sam Vilain2009-10-263-0/+811
* git-svn: convert SVK merge tickets to extra parentsSam Vilain2009-10-261-0/+23
* git-svn: allow test setup script to support PERL env. varSam Vilain2009-10-261-2/+3
* git-svn: add test data for SVK merge, with script.Sam Vilain2009-10-262-0/+673
* Merge branch 'maint'Junio C Hamano2009-10-251-1/+1
|\
| * t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT testMarkus Heidelberg2009-10-241-1/+1
* | Merge branch 'maint'Junio C Hamano2009-10-231-0/+2
|\ \ | |/
| * Merge branch 'jp/maint-send-email-fold' into maintJunio C Hamano2009-10-231-20/+74
| |\
| * \ Merge branch 'pv/maint-add-p-no-exclude' into maintJunio C Hamano2009-10-231-0/+14
| |\ \
| * | | Do not fail "describe --always" in a tag-less repositoryJunio C Hamano2009-10-231-0/+2
* | | | Merge branch 'maint'Junio C Hamano2009-10-212-35/+4
|\ \ \ \ | |/ / /
| * | | Mark files in t/t5100 as UTF-8Johannes Sixt2009-10-211-0/+4
| * | | Remove a left-over file from t/t5100Johannes Sixt2009-10-211-35/+0
* | | | Merge branch 'bg/rebase-reword'Junio C Hamano2009-10-192-3/+17
|\ \ \ \
| * | | | Teach 'rebase -i' the command "reword"Björn Gustavsson2009-10-072-3/+17
* | | | | Merge branch 'jp/maint-send-email-fold'Junio C Hamano2009-10-181-20/+74
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT...Joe Perches2009-10-091-20/+74
* | | | | Merge branch 'cc/replace-no-replace'Junio C Hamano2009-10-181-0/+7
|\ \ \ \ \
| * | | | | git: add --no-replace-objects option to disable replacingChristian Couder2009-10-131-0/+7
* | | | | | Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached'Junio C Hamano2009-10-181-0/+32
|\ \ \ \ \ \
| * | | | | | ls-files: excludes should not impact tracked filesJeff King2009-10-121-0/+32
* | | | | | | Merge branch 'jc/maint-blank-at-eof'Junio C Hamano2009-10-173-3/+110
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano2009-09-153-3/+110
| |\ \ \ \ \ \ \
| | * | | | | | | diff --whitespace: fix blank lines at endJunio C Hamano2009-09-141-1/+1
| | * | | | | | | diff --color: color blank-at-eofJunio C Hamano2009-09-041-0/+9
| | * | | | | | | diff --whitespace=warn/error: fix blank-at-eof checkJunio C Hamano2009-09-041-0/+7
| | * | | | | | | diff --whitespace=warn/error: obey blank-at-eofJunio C Hamano2009-09-042-3/+3
| | * | | | | | | apply --whitespace: warn blank but not necessarily empty lines at EOFJunio C Hamano2009-09-041-0/+13
| | * | | | | | | apply --whitespace=warn/error: diagnose blank at EOFJunio C Hamano2009-09-041-0/+26
| | * | | | | | | apply --whitespace=fix: detect new blank lines at eof correctlyJunio C Hamano2009-09-041-0/+24
| | * | | | | | | apply --whitespace=fix: fix handling of blank lines at the eofJunio C Hamano2009-09-041-0/+29
| | * | | | | | | Merge branch 'maint-1.5.6' into maint-1.6.0Junio C Hamano2009-08-271-0/+39
| | |\ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ Merge branch 'maint'Junio C Hamano2009-10-171-0/+66
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'maint-1.6.4' into maintJunio C Hamano2009-10-161-0/+66
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | grep: do not segfault when -f is usedMatt Kraai2009-10-161-0/+66
| | | |_|_|_|_|/ / / | | |/| | | | | | |
* | | | | | | | | | Merge branch 'pv/maint-add-p-no-exclude'Junio C Hamano2009-10-141-0/+14
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | git-add--interactive: never skip files included in indexPauli Virtanen2009-10-101-0/+14
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'maint'Junio C Hamano2009-10-141-0/+9
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | sha1_file: Fix infinite loop when pack is corruptedShawn O. Pearce2009-10-141-0/+9
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Let --decorate show HEAD positionThomas Rast2009-10-122-2/+2
|/ / / / / / /
* | | | | | | Merge branch 'rs/maint-archive-prefix'Junio C Hamano2009-10-091-0/+12
|\ \ \ \ \ \ \
| * | | | | | | Git archive and trailing "/" in prefixRené Scharfe2009-10-081-0/+12
| |/ / / / / /
* | | | | | | Merge branch 'maint'Junio C Hamano2009-10-041-0/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Merge branch 'jc/maint-1.6.4-show-branch-default' into maintJunio C Hamano2009-10-041-0/+8
| |\ \ \ \ \
| | * | | | | show-branch: fix segfault when showbranch.default existsJunio C Hamano2009-10-041-0/+8
| * | | | | | Merge branch 'jc/maint-unpack-objects-strict' into maintJunio C Hamano2009-09-161-0/+35
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/maint-1.6.3-checkout-unborn' into maintJunio C Hamano2009-09-161-0/+40
| |\ \ \ \ \ \ \