diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-10-21 16:26:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-21 16:26:42 -0700 |
| commit | f7bff60de95951d2c82601350cb3771b347e83ee (patch) | |
| tree | 5c0e747a86d4990b4e5b7176cec670de620dabe8 /Documentation/user-manual.txt | |
| parent | 75a2f301676aefb85c4f67da613cad2405e77927 (diff) | |
| parent | d0bb13663000be47d83cbe53b6c4bdc8835625cb (diff) | |
| download | git-f7bff60de95951d2c82601350cb3771b347e83ee.tar.gz | |
Merge branch 'sn/doc-opt-notation' into maint
* sn/doc-opt-notation:
Fix {update,checkout}-index usage strings
Put a space between `<' and argument in pack-objects usage string
Remove stray quotes in --pretty and --format documentation
Use parentheses and `...' where appropriate
Fix odd markup in --diff-filter documentation
Use angles for placeholders consistently
Diffstat (limited to 'Documentation/user-manual.txt')
| -rw-r--r-- | Documentation/user-manual.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 77eb483b07..fc56da677c 100644 --- 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 |