summaryrefslogtreecommitdiff
path: root/t/t6031-merge-recursive.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-07-30 13:05:13 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-07-30 13:05:13 -0700
commit2e3710bdf945dbffd89c28bc6c12f7ee7f0f55a8 (patch)
treefdea44aea763a0dfa6c68f905101c892a2e65aad /t/t6031-merge-recursive.sh
parentMerge branch 'jv/maint-no-ext-diff' into maint (diff)
parentRevert "git-commit-tree(1): update synopsis" (diff)
downloadtgif-2e3710bdf945dbffd89c28bc6c12f7ee7f0f55a8.tar.xz
Merge branch 'kk/maint-commit-tree' into maint
"git commit-tree" learned a more natural "-p <parent> <tree>" order of arguments long time ago, but recently forgot it by mistake. * kk/maint-commit-tree: Revert "git-commit-tree(1): update synopsis" commit-tree: resurrect command line parsing updates
Diffstat (limited to 't/t6031-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions