aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/commit-tree.c
diff options
context:
space:
mode:
Diffstat (limited to 'builtin/commit-tree.c')
0 files changed, 0 insertions, 0 deletions
='2010-01-16 23:45:29 -0800'>2010-01-16xdl_merge(): allow passing down marker_size in xmparam_tJunio C Hamano2-8/+18 2010-01-16xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano6-12/+17 2010-01-16git_attr(): fix function signatureJunio C Hamano9-14/+19 2010-01-10rerere forget path: forget recorded resolutionJunio C Hamano4-0/+161 2010-01-10rerere: refactor rerere logic to make it independent from I/OJunio C Hamano1-35/+76 2009-12-25rerere: remove silly 1024-byte line limitJunio C Hamano1-9/+10 2009-12-25resolve-undo: teach "update-index --unresolve" to use resolve-undo infoJunio C Hamano3-1/+20 2009-12-25resolve-undo: "checkout -m path" uses resolve-undo informationJunio C Hamano5-0/+77 2009-12-25resolve-undo: allow plumbing to clear the informationJunio C Hamano2-0/+17 2009-12-25resolve-undo: basic testsJunio C Hamano2-1/+130 2009-12-25resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano8-1/+160 2009-12-25builtin-merge.c: use standard active_cache macrosJunio C Hamano1-3/+2 2009-12-23Git 1.6.6v1.6.6Junio C Hamano3-4/+6