summaryrefslogtreecommitdiff
path: root/merge-tree.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-11-24 18:03:29 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-11-24 18:03:29 -0800
commit788ea12d43605945cbfe74b4dadda8f75c23a411 (patch)
treefc435d73e42eaf8f168f9212fc796154d3b56833 /merge-tree.c
parentMerge branch 'lt/maint-rev-list-gitlink' into maint (diff)
parentMake GIT_INDEX_FILE apply to git-commit (diff)
downloadtgif-788ea12d43605945cbfe74b4dadda8f75c23a411.tar.xz
Merge branch 'rv/maint-index-commit' into maint
* rv/maint-index-commit: Make GIT_INDEX_FILE apply to git-commit
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions