index f60eacd93e96a080689569b1afd6736c05554ab7..a446a6b5a27067d25c1d32d97ccbbd9e59e3b754 100644 (file)
[ [\--objects | \--objects-edge] [ \--unpacked ] ]
[ \--pretty | \--header ]
[ \--bisect ]
+ [ \--merge ]
<commit>... [ \-- <paths>... ]
DESCRIPTION
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>