git-merge-ours: make sure our index matches HEAD

diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index 099db294f4316fc39b451e2f54f9736bce9baf3b..dfe21391aa8e5630c36ea06180f22b4eb1ce40cc 100644 (file)
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -72,6 +72,14 @@ OPTIONS
        path of the current directory relative to the top-level
        directory.
 
+--since=datestring, --after=datestring::
+       Parses the date string, and outputs corresponding
+       --max-age= parameter for git-rev-list command.
+
+--until=datestring, --before=datestring::
+       Parses the date string, and outputs corresponding
+       --min-age= parameter for git-rev-list command.
+
 <args>...::
        Flags and parameters to be parsed.