Merge branch 'aw/git-p4-deletion'

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 77eb483b07bc3b04d5b32199553fff46c11fe7f0..fc56da677cb0ed3d9243bfb928686b60df213243 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -3853,7 +3853,7 @@ You create a commit object by giving it the tree that describes the
 state at the time of the commit, and a list of parents:
 
 -------------------------------------------------
-$ git commit-tree <tree> -p <parent> [-p <parent2> ..]
+$ git commit-tree <tree> -p <parent> [(-p <parent2>)...]
 -------------------------------------------------
 
 and then giving the reason for the commit on stdin (either through