Document rev-list's option [email protected]
PATCH 1/1 Document rev-list's option [email protected]
Signed-off-by Uwe Zeisberger <[email protected]>
---
The description is not very verbose, but at least it is mentioned now.
Documentation/git-rev-list.txt | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
Documentation/git-rev-list.txt +5 -0
@@ -22,6 +22,7 @@ SYNOPSIS [ [\--objects | \--objects-edge] [ \--unpacked ] ] [ \--pretty | \--header ] [ \--bisect ] + [ \--merge ] <commit>... [ \-- <paths>... ] DESCRIPTION
@@ -123,6 +124,10 @@ 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. + Author ------ Written by Linus Torvalds <[email protected]>
Signature · 9 lines
1.4.2.rc2.gb63f -- Uwe Zeisberger FS Forth-Systeme GmbH, A Digi International Company Kueferstrasse 8, D-79206 Breisach, Germany Phone: +49 (7667) 908 0 Fax: +49 (7667) 908 200 Web: www.fsforth.de, www.digi.com