summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint-1.6.1Junio C Hamano2009-05-034-5/+29
|\
| * match_tree_entry(): a pathspec only matches at directory boundariesJunio C Hamano2009-04-012-2/+12
| * tree_entry_interesting: a pathspec only matches at directory boundaryBjörn Steinbrink2009-04-012-3/+17
* | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-292-12/+65
|\ \
| * | diff -c -p: do not die on submodulesJunio C Hamano2009-04-292-12/+65
* | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-284-4/+12
|\ \ \ | |/ /
| * | grep: fix segfault when "git grep '('" is givenLinus Torvalds2009-04-272-2/+10
| * | Documentation: fix a grammatical error in api-builtin.txtAllan Caffee2009-04-271-1/+1
| * | builtin-merge: fix a typo in an error messageAllan Caffee2009-04-271-1/+1
* | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-241-1/+1
|\ \ \ | |/ /
| * | test-genrandom: Add newline to usage stringStephen Boyd2009-04-231-1/+1
* | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-183-9/+20
|\ \ \ | |/ /
| * | doc/git-daemon: add missing arguments to optionsMarkus Heidelberg2009-04-181-8/+8
| * | init: Do not segfault on big GIT_TEMPLATE_DIR environment variableFrank Lichtenheld2009-04-182-1/+12
* | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-172-2/+9
|\ \ \ | |/ /
| * | Fix buffer overflow in config parserThomas Jarosch2009-04-172-2/+9
* | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-122-0/+5
|\ \ \ | |/ /
| * | State the effect of filter-branch on graft explicitlyDaniel Cheng (aka SDiZ)2009-04-121-0/+3
| * | process_{tree,blob}: Remove useless xstrdup callsLinus Torvalds2009-04-121-0/+2
* | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-082-3/+0
|\ \ \ | |/ /
| * | process_{tree,blob}: Remove useless xstrdup callsBjörn Steinbrink2009-04-082-3/+0
* | | Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1Junio C Hamano2009-04-081-4/+4
|\ \ \
| * | | blame: read custom grafts given by -S before calling setup_revisions()Junio C Hamano2009-03-181-4/+4
* | | | Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint-1.6.1Junio C Hamano2009-04-082-2/+2
|\ \ \ \
| * | | | git-branch: display "was sha1" on branch deletion rather than just "sha1"Brandon Casey2009-03-212-2/+2
* | | | | Merge branch 'js/maint-1.6.0-exec-path-env' into maint-1.6.1Junio C Hamano2009-04-081-0/+4
|\ \ \ \ \
| * | | | | Propagate --exec-path setting to external commands via GIT_EXEC_PATHJohannes Sixt2009-03-211-0/+4
* | | | | | Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint-1.6.1Junio C Hamano2009-04-081-9/+12
|\ \ \ \ \ \
| * | | | | | Documentation: format-patch --root clarificationsThomas Rast2009-03-271-9/+12
* | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-073-9/+13
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Documentation: clarify .gitattributes searchJason Merrill2009-04-072-5/+5
| * | | | | | git-checkout.txt: clarify that <branch> applies when no path is given.Matthieu Moy2009-04-071-2/+6
| * | | | | | git-checkout.txt: fix incorrect statement about HEAD and indexMatthieu Moy2009-04-071-2/+2
* | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-052-2/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | commit: abort commit if interactive add failedJeff King2009-04-051-1/+2
| * | | | | | git-repack: use non-dashed update-server-infoDan McGee2009-04-051-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-011-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Documentation: Remove an odd "instead"Holger Weiß2009-04-011-1/+1
* | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-03-303-6/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix bash completion in path with spacesDaniel Cheng (aka SDiZ)2009-03-301-2/+2
| * | | | | bash completion: only show 'log --merge' if mergingThomas Rast2009-03-301-1/+6
| * | | | | git-tag(1): add hint about commit messagesNico -telmich- Schottelius2009-03-301-0/+1
| * | | | | Documentation: update graph api example.Allan Caffee2009-03-301-4/+4
* | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-03-291-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | import-zips: fix thinkoJohannes Schindelin2009-03-291-1/+2
* | | | | | test-lib: Clean up comments and Makefile.Emil Sit2009-03-282-9/+1
| |/ / / / |/| | | |
* | | | | diff --no-index: Do not generate patch output if other output is requestedJohannes Sixt2009-03-251-2/+2
* | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-03-242-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | close_sha1_file(): make it easier to diagnose errorsLinus Torvalds2009-03-241-1/+1
| * | | | avoid possible overflow in delta size filtering computationNicolas Pitre2009-03-241-1/+1