X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-rev-list.txt;h=a446a6b5a27067d25c1d32d97ccbbd9e59e3b754;hb=0f2ca9d5c99436d048bfe0a7161b4365a731938f;hp=f60eacd93e96a080689569b1afd6736c05554ab7;hpb=24cf6e5847073d50390e0b7950e8e6b5a09103bc;p=git.git

diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index f60eacd93..a446a6b5a 100644
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -22,6 +22,7 @@ SYNOPSIS
 	     [ [\--objects | \--objects-edge] [ \--unpacked ] ]
 	     [ \--pretty | \--header ]
 	     [ \--bisect ]
+	     [ \--merge ]
 	     <commit>... [ \-- <paths>... ]
 
 DESCRIPTION
@@ -123,6 +124,15 @@ OPTIONS
 	topological order (i.e. descendant commits are shown
 	before their parents).
 
+--merge::
+	After a failed merge, show refs that touch files having a
+	conflict and don't exist on all heads to merge.
+
+--relative-date::
+	Show dates relative to the current time, e.g. "2 hours ago".
+	Only takes effect for dates shown in human-readable format,
+	such as when using "--pretty".
+
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>