summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* stash pop: remove 'apply' options during 'drop' invocationThomas Rast2010-02-151-0/+9
* t8003: check exit code of command and error message separatelyJunio C Hamano2010-02-101-2/+4
* blame: prevent a segv when -L given start > EOFJay Soffian2010-02-081-0/+8
* Merge branch 'sb/maint-octopus' into maint-1.6.5Junio C Hamano2010-02-011-0/+51
|\
| * octopus: reenable fast-forward mergesStephen Boyd2009-12-131-0/+18
| * octopus: make merge process simpler to followStephen Boyd2009-12-131-0/+33
* | Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5Junio C Hamano2010-01-201-0/+6
|\ \
| * | reset: unbreak hard resets with GIT_WORK_TREEJeff King2009-12-301-0/+6
* | | Merge branch 'maint-1.6.4' into maint-1.6.5Junio C Hamano2010-01-182-20/+20
|\ \ \
| * \ \ Merge branch 'maint-1.6.3' into maint-1.6.4Junio C Hamano2010-01-182-20/+20
| |\ \ \
| | * \ \ Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano2010-01-182-20/+20
| | |\ \ \
| | | * \ \ Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2010-01-102-20/+20
| | | |\ \ \
| | | | * \ \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2010-01-101-13/+13
| | | | |\ \ \
| | | | | * | | branch: die explicitly why when calling "git branch [-a|-r] branchname".Matthieu Moy2009-12-311-13/+13
| | | | * | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-12-291-7/+7
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | t7102: make the test fail if one of its check failsNguyễn Thái Ngọc Duy2009-12-291-7/+7
| * | | | | | | Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4Junio C Hamano2010-01-181-1/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Fix mis-backport of t7002Junio C Hamano2010-01-181-1/+5
* | | | | | | | | Prevent git blame from segfaulting on a missing author nameDavid Reiss2009-12-221-0/+13
* | | | | | | | | worktree: don't segfault with an absolute pathspec without a work treeJunio C Hamano2009-12-161-0/+15
* | | | | | | | | ignore unknown color configurationJeff King2009-12-161-0/+17
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Remove post-upload-hookJunio C Hamano2009-12-101-69/+0
* | | | | | | | Merge branch 'jk/maint-add-p-delete-fix' into maintJunio C Hamano2009-12-081-0/+20
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | add-interactive: fix deletion of non-empty filesJeff King2009-12-071-0/+20
* | | | | | | | reset: improve worktree safety valvesJeff King2009-12-051-3/+29
* | | | | | | | Merge branch 'uk/maint-shortlog-encoding' into maintJunio C Hamano2009-12-031-0/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | t4201: use ISO8859-1 rather than ISO-8859-1Brandon Casey2009-12-031-2/+2
| * | | | | | | | shortlog: respect commit encodingUwe Kleine-König2009-11-251-0/+28
* | | | | | | | | Merge branch 'fc/maint-format-patch-pathspec-dashes' into maintJunio C Hamano2009-12-031-0/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | format-patch: add test for parsing of "--"Felipe Contreras2009-11-261-0/+5
| |/ / / / / / / /
* | | | | | | | | Merge branch 'rj/maint-t9700' into maintJunio C Hamano2009-12-031-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t9700-perl-git.sh: Fix a test failure on CygwinRamsay Jones2009-11-191-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'ls/maint-mailinfo-no-inbody' into maintJunio C Hamano2009-12-0314-1/+101
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git am/mailinfo: Don't look at in-body headers when rebasingLukas Sandström2009-11-2014-1/+101
| |/ / / / / / / /
* | | | | | | | | Merge branch 'pb/maint-use-custom-perl' into maintJunio C Hamano2009-12-033-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make sure $PERL_PATH is defined when the test suite is run.Philippe Bruhat (BooK)2009-11-173-4/+4
| |/ / / / / / / /
* | | | | | | | | Merge branch 'bc/grep-i-F' into maintJunio C Hamano2009-12-031-0/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | grep: Allow case insensitive search of fixed-stringsBrian Collins2009-11-161-0/+10
| |/ / / / / / / /
* | | | | | | | | merge: do not add standard message when message is given with -m optionJunio C Hamano2009-12-021-5/+2
* | | | | | | | | builtin-apply.c: pay attention to -p<n> when determining the nameJunio C Hamano2009-11-261-0/+17
* | | | | | | | | Merge branch 'jk/maint-add-p-empty' into maintJunio C Hamano2009-11-161-0/+17
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | add-interactive: handle deletion of empty filesJeff King2009-10-271-0/+17
| |/ / / / / / /
* | | | | | | | Merge branch 'js/maint-diff-color-words' into maintJunio C Hamano2009-11-161-0/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | diff --color-words -U0: fix the location of hunk headersJohannes Schindelin2009-10-301-1/+1
| * | | | | | | | t4034-diff-words: add a test for word diff without contextMarkus Heidelberg2009-10-301-0/+20
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/maint-format-patch-p-suppress-stat' into maintJunio C Hamano2009-11-151-0/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | format-patch: make "-p" suppress diffstatJeff King2009-11-081-0/+21
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/maint-1.6.3-ls-files-i' into maintJunio C Hamano2009-11-151-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | ls-files: unbreak "ls-files -i"Jeff King2009-10-301-0/+8
* | | | | | | | | Merge branch 'jc/maint-blank-at-eof' into maintJunio C Hamano2009-11-153-3/+110
|\ \ \ \ \ \ \ \ \