diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-08-04 10:04:30 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-08-04 10:04:30 +0000 |
| commit | 859f3b44938b9425bddcb609791606d2302f367a (patch) | |
| tree | 5dcad3a36e86319549a608704cd10a1c43063374 /git-rev-list.txt | |
| parent | b518f456db4e89a2f48c2c0800f9f1b124947ca4 (diff) | |
| download | git-htmldocs-859f3b44938b9425bddcb609791606d2302f367a.tar.gz | |
Autogenerated HTML docs for v1.4.2-rc3-g7e18e
Diffstat (limited to 'git-rev-list.txt')
| -rw-r--r-- | git-rev-list.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/git-rev-list.txt b/git-rev-list.txt index f60eacd93..dd9fff16d 100644 --- a/git-rev-list.txt +++ b/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> |