summaryrefslogtreecommitdiff
path: root/Documentation
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 /Documentation
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 'Documentation')
-rw-r--r--Documentation/git-commit-tree.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt
index ff73286509..6d5a04c83b 100644
--- a/Documentation/git-commit-tree.txt
+++ b/Documentation/git-commit-tree.txt
@@ -10,7 +10,7 @@ SYNOPSIS
--------
[verse]
'git commit-tree' <tree> [(-p <parent>)...] < changelog
-'git commit-tree' <tree> [(-p <parent>)...] [(-m <message>)...] [(-F <file>)...]
+'git commit-tree' [(-p <parent>)...] [(-m <message>)...] [(-F <file>)...] <tree>
DESCRIPTION
-----------