summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jh/maint-submodule-status-in-void'Junio C Hamano2010-03-021-0/+7
|\
| * submodule summary: Don't barf when invoked in an empty repoJohan Herland2010-02-171-0/+7
* | Merge branch 'ac/cvsimport-revision-mapping'Junio C Hamano2010-03-021-3/+33
|\ \
| * | cvsimport: new -R option: generate .git/cvs-revisions mappingAaron Crane2010-02-061-3/+33
* | | Merge branch 'jc/grep-author-all-match-implicit'Junio C Hamano2010-03-021-1/+9
|\ \ \
| * | | "log --author=me --grep=it" should find intersection, not unionJunio C Hamano2010-01-251-1/+9
* | | | Merge branch 'cc/maint-bisect-paths'Junio C Hamano2010-03-011-0/+5
|\ \ \ \
| * | | | bisect: error out when passing bad path parametersChristian Couder2010-03-011-0/+5
* | | | | git-svn: Fix discarding of extra parents from svn:mergeinfoTuomas Suutari2010-02-261-1/+1
* | | | | t9151: Add two new svn:mergeinfo test casesTuomas Suutari2010-02-263-53/+581
* | | | | t9151: Fix a few commits in the SVN dumpTuomas Suutari2010-02-262-38/+74
* | | | | Merge branch 'maint'Junio C Hamano2010-02-251-0/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'maint-1.6.6' into maintJunio C Hamano2010-02-251-0/+1
| |\ \ \ \ \
| | * | | | | t3301-notes: insert a shbang line in ./fake_editor.shJohannes Sixt2010-02-251-0/+1
* | | | | | | Windows: redirect f[re]open("/dev/null") to f[re]open("nul")Johannes Sixt2010-02-252-0/+11
* | | | | | | Merge branch 'sp/push-sideband'Junio C Hamano2010-02-211-42/+42
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'sp/maint-push-sideband' into sp/push-sidebandJunio C Hamano2010-02-101-31/+31
| |\ \ \ \ \ \ \
| | * | | | | | | receive-pack: Send internal errors over side-band #2Shawn O. Pearce2010-02-101-1/+2
| | * | | | | | | t5401: Use a bare repository for the remote peerShawn O. Pearce2010-02-091-29/+29
| * | | | | | | | Merge branch 'sp/maint-push-sideband' into sp/push-sidebandJunio C Hamano2010-02-051-11/+11
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | receive-pack: Send hook output over side band #2Shawn O. Pearce2010-02-051-11/+11
* | | | | | | | Merge branch 'jc/checkout-detached'Junio C Hamano2010-02-211-10/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | Reword "detached HEAD" notificationJunio C Hamano2010-01-291-10/+22
* | | | | | | | | Merge branch 'jc/maint-fix-test-perm'Junio C Hamano2010-02-212-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | lib-patch-mode.sh: Fix permissionJunio C Hamano2010-01-301-0/+2
| * | | | | | | | | Merge commit 'b319ef7' into jc/maint-fix-test-permJunio C Hamano2010-01-30599-3731/+44753
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | t6000lib: Fix permissionJunio C Hamano2010-01-301-0/+2
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-02-201-8/+8
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | t1450: fix testcases that were wrongly expecting failureThomas Rast2010-02-191-8/+8
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-02-191-0/+8
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'jk/maint-rmdir-fix' into maintJunio C Hamano2010-02-191-0/+8
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | rm: fix bug in recursive subdirectory removalJeff King2010-02-181-0/+8
| * | | | | | | | | | | Merge branch 'jk/grep-double-dash' into maintJunio C Hamano2010-02-171-0/+33
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint'Junio C Hamano2010-02-161-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'maint-1.6.6' into maintJunio C Hamano2010-02-161-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | * | | | | | | | | | Merge branch 'maint-1.6.5' into maint-1.6.6Junio C Hamano2010-02-161-0/+9
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | | * | | | | | | | | stash pop: remove 'apply' options during 'drop' invocationThomas Rast2010-02-151-0/+9
* | | | | | | | | | | | Merge branch 'rs/git-dir-cleanup'Junio C Hamano2010-02-131-0/+52
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Resurrect "git grep --no-index"Junio C Hamano2010-02-131-0/+52
* | | | | | | | | | | | | Merge branch 'jk/grep-double-dash'Junio C Hamano2010-02-131-0/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | / / / / / / / / | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | accept "git grep -- pattern"Jeff King2010-02-071-0/+33
* | | | | | | | | | | | Sync with 1.6.6.2Junio C Hamano2010-02-101-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'maint-1.6.5' into maintJunio C Hamano2010-02-101-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | t8003: check exit code of command and error message separatelyJunio C Hamano2010-02-101-2/+4
| * | | | | | | | | | | Merge branch 'sp/maint-fast-import-large-blob' into maintJunio C Hamano2010-02-102-1/+47
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-reflog-bad-timestamp' into maintJunio C Hamano2010-02-101-0/+45
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jh/maint-config-file-prefix' into maintJunio C Hamano2010-02-101-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maintJunio C Hamano2010-02-101-0/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | t3902: Protect against OS X normalizationBrian Gernhardt2010-02-081-4/+4
* | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-02-081-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /