summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2009-04-17Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano2-2/+9
2009-04-17Fix buffer overflow in config parserLibravatar Thomas Jarosch2-2/+9
2009-04-12Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano2-0/+5
2009-04-12State the effect of filter-branch on graft explicitlyLibravatar Daniel Cheng (aka SDiZ)1-0/+3
2009-04-12process_{tree,blob}: Remove useless xstrdup callsLibravatar Linus Torvalds1-0/+2
2009-04-08Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano2-3/+0
2009-04-08Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1Libravatar Junio C Hamano1-4/+4
2009-04-08Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint-1.6.1Libravatar Junio C Hamano2-2/+2
2009-04-08Merge branch 'js/maint-1.6.0-exec-path-env' into maint-1.6.1Libravatar Junio C Hamano1-0/+4
2009-04-08Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint-1.6.1Libravatar Junio C Hamano1-9/+12
2009-04-08process_{tree,blob}: Remove useless xstrdup callsLibravatar Björn Steinbrink2-3/+0
2009-04-07Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano3-9/+13
2009-04-07Documentation: clarify .gitattributes searchLibravatar Jason Merrill2-5/+5
2009-04-07git-checkout.txt: clarify that <branch> applies when no path is given.Libravatar Matthieu Moy1-2/+6
2009-04-07git-checkout.txt: fix incorrect statement about HEAD and indexLibravatar Matthieu Moy1-2/+2
2009-04-05Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano2-2/+3
2009-04-05commit: abort commit if interactive add failedLibravatar Jeff King1-1/+2
2009-04-05git-repack: use non-dashed update-server-infoLibravatar Dan McGee1-1/+1
2009-04-01Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano1-1/+1
2009-04-01Documentation: Remove an odd "instead"Libravatar Holger Weiß1-1/+1
2009-03-30Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano3-6/+12
2009-03-30Fix bash completion in path with spacesLibravatar Daniel Cheng (aka SDiZ)1-2/+2
2009-03-30bash completion: only show 'log --merge' if mergingLibravatar Thomas Rast1-1/+6
2009-03-30git-tag(1): add hint about commit messagesLibravatar Nico -telmich- Schottelius1-0/+1
2009-03-30Documentation: update graph api example.Libravatar Allan Caffee1-4/+4
2009-03-29Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano1-1/+2
2009-03-29import-zips: fix thinkoLibravatar Johannes Schindelin1-1/+2
2009-03-28test-lib: Clean up comments and Makefile.Libravatar Emil Sit2-9/+1
2009-03-27Documentation: format-patch --root clarificationsLibravatar Thomas Rast1-9/+12
2009-03-25diff --no-index: Do not generate patch output if other output is requestedLibravatar Johannes Sixt1-2/+2
2009-03-24Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano2-2/+2
2009-03-24close_sha1_file(): make it easier to diagnose errorsLibravatar Linus Torvalds1-1/+1
2009-03-24avoid possible overflow in delta size filtering computationLibravatar Nicolas Pitre1-1/+1
2009-03-22Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano1-1/+1
2009-03-22everyday: use the dashless form of git-initLibravatar David Aguilar1-1/+1
2009-03-21Merge branch 'js/maint-1.6.0-path-normalize' into maint-1.6.1Libravatar Junio C Hamano6-152/+115
2009-03-21Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1Libravatar Junio C Hamano7-27/+73
2009-03-21Propagate --exec-path setting to external commands via GIT_EXEC_PATHLibravatar Johannes Sixt1-0/+4
2009-03-21git-branch: display "was sha1" on branch deletion rather than just "sha1"Libravatar Brandon Casey2-2/+2
2009-03-18blame: read custom grafts given by -S before calling setup_revisions()Libravatar Junio C Hamano1-4/+4
2009-03-12Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano4-38/+82
2009-03-12Merge branch 'en/maint-1.6.1-hash-object' into maint-1.6.1Libravatar Junio C Hamano1-2/+2
2009-03-12Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.0Libravatar Junio C Hamano22-10/+229
2009-03-12Merge branch 'cc/maint-1.6.0-bisect-fix' into maint-1.6.0Libravatar Junio C Hamano2-36/+73
2009-03-12Merge branch 'fg/maint-1.6.0-exclude-bq' into maint-1.6.0Libravatar Junio C Hamano2-2/+9
2009-03-12Merge branch 'js/maint-1.6.1-filter-branch-submodule' into maint-1.6.1Libravatar Junio C Hamano1-1/+1
2009-03-12Merge branch 'gt/maint-1.6.1-utf8-width' into maint-1.6.1Libravatar Junio C Hamano3-5/+27
2009-03-12Merge branch 'js/maint-1.6.1-remote-remove-mirror' into maint-1.6.1Libravatar Junio C Hamano2-7/+58
2009-03-12Merge branch 'ek/maint-1.6.1-filter-branch-bare' into maint-1.6.1Libravatar Junio C Hamano2-13/+16
2009-03-12Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1Libravatar Junio C Hamano2-1/+69