aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-23 20:55:53 -0700
committerJunio C Hamano <gitster@pobox.com>2012-07-23 20:55:54 -0700
commita7fe78a8953a1c4d8abcb36f28133078a778b8d2 (patch)
tree7fa358290791b2e7784763ec2fd49b568ecc689c /Documentation
parent9837911c139cefae24c7bc68751cd1cfdc950554 (diff)
parent4b7518a4aa24339d53e04151ba6b337245527c03 (diff)
downloadgit-a7fe78a8953a1c4d8abcb36f28133078a778b8d2.tar.gz
git-a7fe78a8953a1c4d8abcb36f28133078a778b8d2.tar.xz
Merge branch 'kk/maint-commit-tree'
* 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 ff7328650..6d5a04c83 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
-----------