summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-30 20:05:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-07-30 20:05:13 (GMT)
commit2e3710bdf945dbffd89c28bc6c12f7ee7f0f55a8 (patch)
treefdea44aea763a0dfa6c68f905101c892a2e65aad /Documentation
parent70f6be7aa9a1f435d64df11ec92ff84982bfc581 (diff)
parent4b7518a4aa24339d53e04151ba6b337245527c03 (diff)
downloadgit-2e3710bdf945dbffd89c28bc6c12f7ee7f0f55a8.zip
git-2e3710bdf945dbffd89c28bc6c12f7ee7f0f55a8.tar.gz
git-2e3710bdf945dbffd89c28bc6c12f7ee7f0f55a8.tar.bz2
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 ff73286..6d5a04c 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
-----------