rerere: add documentation for conflict normalization

diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt
index 9f13266a685176bf142d9e381d7a9d10ea12aa7b..592e06d839d87f28cf6cbbdcf3aa3253da2eb9f0 100644 (file)
--- a/Documentation/gitcli.txt
+++ b/Documentation/gitcli.txt
@@ -110,8 +110,8 @@ couple of magic command-line options:
 +
 ---------------------------------------------
 $ git describe -h
-usage: git describe [options] <commit-ish>*
-   or: git describe [options] --dirty
+usage: git describe [<options>] <commit-ish>*
+   or: git describe [<options>] --dirty
 
     --contains            find the tag that comes after the commit
     --debug               debug search strategy on stderr