summaryrefslogtreecommitdiffstats
path: root/t (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maintJunio C Hamano2010-02-101-0/+57
|\
| * checkout -m path: fix recreating conflictsJunio C Hamano2010-01-061-0/+57
* | Merge branch 'maint-1.6.5' into maintJunio C Hamano2010-02-091-0/+8
|\ \
| * | blame: prevent a segv when -L given start > EOFJay Soffian2010-02-091-0/+8
| * | Merge branch 'sb/maint-octopus' into maint-1.6.5Junio C Hamano2010-02-011-0/+51
| |\ \
* | | | archive: simplify archive format guessingRené Scharfe2010-02-081-0/+10
* | | | Merge branch 'jc/maint-limit-note-output' into maintJunio C Hamano2010-02-051-0/+59
|\ \ \ \
| * | | | Fix "log --oneline" not to show notesJunio C Hamano2010-01-211-2/+4
| * | | | Fix "log" family not to be too agressive about showing notesJunio C Hamano2010-01-211-0/+57
* | | | | ignore duplicated slashes in make_relative_path()Junio C Hamano2010-01-231-0/+6
|/ / / /
* | | | Merge branch 'bg/maint-remote-update-default' into maintJunio C Hamano2010-01-201-0/+14
|\ \ \ \
| * | | | Fix "git remote update" with remotes.defalt setBjörn Gustavsson2009-12-311-0/+14
* | | | | Merge branch 'sb/maint-octopus' into maintJunio C Hamano2010-01-201-0/+51
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | octopus: reenable fast-forward mergesStephen Boyd2009-12-141-0/+18
| * | | | octopus: make merge process simpler to followStephen Boyd2009-12-141-0/+33
* | | | | Merge branch 'maint-1.6.5' into maintJunio C Hamano2010-01-201-0/+6
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | 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-192-20/+20
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'maint-1.6.3' into maint-1.6.4Junio C Hamano2010-01-192-20/+20
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano2010-01-192-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
| | | | | |\ \ \ \ \
| | * | | | \ \ \ \ \ Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4Junio C Hamano2010-01-191-1/+5
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix mis-backport of t7002Junio C Hamano2010-01-191-1/+5
* | | | | | | | | | | | remote-curl: Fix Accept header for smart HTTP connectionsShawn O. Pearce2010-01-121-1/+1
* | | | | | | | | | | | Merge branch 'maint-1.6.0' into maintJunio C Hamano2010-01-011-13/+13
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | branch: die explicitly why when calling "git branch [-a|-r] branchname".Matthieu Moy2009-12-311-13/+13
* | | | | | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-12-301-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-12-301-7/+7
| |\| | | | | | | | | |
| | * | | | | | | | | | t7102: make the test fail if one of its check failsNguyễn Thái Ngọc Duy2009-12-301-7/+7
* | | | | | | | | | | | t4019 "grep" portability fixJunio C Hamano2009-12-261-28/+28
* | | | | | | | | | | | t1200: work around a bug in some implementations of "find"Junio C Hamano2009-12-261-1/+1
* | | | | | | | | | | | git svn: add test for a git svn gc followed by a git svn mkdirsRobert Zeh2009-12-231-0/+40
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-12-221-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Prevent git blame from segfaulting on a missing author nameDavid Reiss2009-12-221-0/+13
* | | | | | | | | | | | git-svn: detect cherry-picks correctly.Sam Vilain2009-12-211-2/+2
* | | | | | | | | | | | git-svn: fix some mistakes with interpreting SVN mergeinfo commit rangesSam Vilain2009-12-211-1/+1
* | | | | | | | | | | | git-svn: expand the svn mergeinfo test suite, highlighting some failuresSam Vilain2009-12-213-172/+860
* | | | | | | | | | | | t9146: use 'svn_cmd' wrapperEric Wong2009-12-201-1/+1
* | | | | | | | | | | | git svn: make empty directory creation gc-awareEric Wong2009-12-191-0/+24
* | | | | | | | | | | | Merge branch 'maint' to sync with 1.6.5.7Junio C Hamano2009-12-162-0/+32
|\| | | | | | | | | | |
| * | | | | | | | | | | 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
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Sync with 1.6.5.6Junio C Hamano2009-12-111-69/+0
|\| | | | | | | | | |
| * | | | | | | | | | Remove post-upload-hookJunio C Hamano2009-12-101-69/+0
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-12-091-0/+20
|\| | | | | | | | | |
| * | | | | | | | | | Merge branch 'jk/maint-add-p-delete-fix' into maintJunio C Hamano2009-12-091-0/+20
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| | * | | | | | | | | add-interactive: fix deletion of non-empty filesJeff King2009-12-081-0/+20
* | | | | | | | | | | git svn: log removals of empty directoriesEric Wong2009-12-081-0/+10