summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* hex.c: reduce memory footprint of sha1_to_hex static bufferssb/hex-object-name-is-at-most-41-bytes-longStefan Beller2015-02-131-1/+1
* slim down "git show-index"Linus Torvalds2010-01-214-67/+69
* Remove diff machinery dependency from read-cacheLinus Torvalds2010-01-212-78/+76
* git-rebase.txt: Fix spellingHorst H. von Brand2010-01-211-1/+1
* Make 'rerere forget' work from a subdirectory.Johannes Sixt2010-01-212-24/+53
* Make test case numbers uniqueJohannes Sixt2010-01-212-0/+0
* conflict-marker-size: add test and docsJunio C Hamano2010-01-202-0/+29
* Update draft release notes to 1.7.0Junio C Hamano2010-01-201-1/+45
* Merge branch 'bw/cvsimport'Junio C Hamano2010-01-201-35/+35
|\
| * cvsimport: standarize system() calls to external git toolsBen Walton2010-01-191-5/+5
| * cvsimport: standarize open() calls to external git toolsBen Walton2010-01-191-4/+4
| * cvsimport: modernize callouts to git subcommandsBen Walton2010-01-191-32/+32
* | Merge branch 'jc/checkout-merge-base'Junio C Hamano2010-01-201-2/+4
|\ \
| * | Fix "checkout A..." synonym for "checkout A...HEAD" on WindowsJunio C Hamano2010-01-191-2/+4
* | | Merge branch 'ag/patch-header-verify'Junio C Hamano2010-01-202-1/+39
|\ \ \
| * | | builtin-apply.c: fix the --- and +++ header filename consistency checkAndreas Gruenbacher2010-01-182-1/+39
* | | | Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-01-2016-78/+155
|\ \ \ \
| * | | | rerere: honor conflict-marker-size attributeJunio C Hamano2010-01-173-2/+20
| * | | | rerere: prepare for customizable conflict marker lengthJunio C Hamano2010-01-171-10/+44
| * | | | conflict-marker-size: new attributeJunio C Hamano2010-01-161-25/+34
| * | | | rerere: use ll_merge() instead of using xdl_merge()Junio C Hamano2010-01-161-4/+1
| * | | | merge-tree: use ll_merge() not xdl_merge()Junio C Hamano2010-01-162-11/+9
| * | | | xdl_merge(): allow passing down marker_size in xmparam_tJunio C Hamano2010-01-162-8/+18
| * | | | xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano2010-01-166-12/+17
| * | | | git_attr(): fix function signatureJunio C Hamano2010-01-169-14/+19
* | | | | Merge branch 'ag/maint-apply-too-large-p'Junio C Hamano2010-01-202-2/+14
|\ \ \ \ \
| * | | | | builtin-apply.c: Skip filenames without enough componentsAndreas Gruenbacher2010-01-182-2/+14
* | | | | | Merge branch 'ap/merge-backend-opts'Junio C Hamano2010-01-2021-54/+392
|\ \ \ \ \ \
| * | | | | | Document that merge strategies can now take their own optionsJunio C Hamano2010-01-172-1/+33
| * | | | | | Extend merge-subtree tests to test -Xsubtree=dir.Avery Pennarun2010-01-171-1/+46
| * | | | | | Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano2010-01-176-18/+91
| * | | | | | pull: Fix parsing of -X<option>Junio C Hamano2010-01-171-7/+14
| * | | | | | Teach git-pull to pass -X<option> to git-mergeAvery Pennarun2010-01-172-2/+23
| * | | | | | git merge -X<option>Avery Pennarun2010-01-1711-26/+162
| * | | | | | git-merge-file --ours, --theirsJunio C Hamano2009-11-294-10/+34
| * | | | | | Merge remote branch 'ko/master' into HEADJunio C Hamano2009-11-29320-2456/+15901
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'nd/status-partial-refresh'Junio C Hamano2010-01-203-3/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | rm: only refresh entries that we may touchNguyễn Thái Ngọc Duy2010-01-191-1/+2
| * | | | | | | | status: only touch path we may need to checkNguyễn Thái Ngọc Duy2010-01-152-2/+2
* | | | | | | | | Merge remote branch 'remotes/trast-doc/for-next'Junio C Hamano2010-01-20116-685/+693
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: spell 'git cmd' without dash throughoutThomas Rast2010-01-10112-647/+647
| * | | | | | | | | Documentation: format full commands in typewriter fontThomas Rast2010-01-1012-28/+28
| * | | | | | | | | Documentation: warn prominently against merging with dirty treesThomas Rast2010-01-092-0/+8
| * | | | | | | | | Documentation/git-merge: reword references to "remote" and "pull"Thomas Rast2010-01-091-17/+17
* | | | | | | | | | Merge branch 'jh/notes' (early part)Junio C Hamano2010-01-204-18/+895
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add more testcases to test fast-import of notesJohan Herland2009-12-071-0/+623
| * | | | | | | | | | Rename t9301 to t9350, to make room for more fast-import testsJohan Herland2009-12-071-0/+0
| * | | | | | | | | | fast-import: Proper notes tree manipulationJohan Herland2009-12-072-18/+272
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-01-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-refresh-index-is-optional-for-status' into maintJunio C Hamano2010-01-201-4/+6
| |\ \ \ \ \ \ \ \ \ \ \