diff options
| author | Uwe Zeisberger <Uwe_Zeisberger@digi.com> | 2006-08-04 08:11:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-04 09:08:02 (GMT) |
| commit | d249b455475977f305240bb73473f25d040012cf (patch) | |
| tree | c6be092cb75597eccaa42164e1c2320666c015f8 /Documentation/git-rev-list.txt | |
| parent | cba05fa840b637db2708014142a753680d930082 (diff) | |
| download | git-d249b455475977f305240bb73473f25d040012cf.zip git-d249b455475977f305240bb73473f25d040012cf.tar.gz git-d249b455475977f305240bb73473f25d040012cf.tar.bz2 | |
Document rev-list's option --merge
Signed-off-by: Uwe Zeisberger <Uwe_Zeisberger@digi.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-rev-list.txt')
| -rw-r--r-- | Documentation/git-rev-list.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt index f60eacd..dd9fff1 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,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 <torvalds@osdl.org> |