gitweb: Fix bug in "blobdiff" view for split (e.g. file to symlink) patches

[git.git] / Documentation / git-rev-list.txt

diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index c742117595cd8ae5ab371a7ba21513a419af7996..11ce395c982d5eb217d13441c2668884cc371d22 100644 (file)
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -21,12 +21,14 @@ SYNOPSIS
             [ \--stdin ]
             [ \--topo-order ]
             [ \--parents ]
             [ \--stdin ]
             [ \--topo-order ]
             [ \--parents ]

+            [ \--left-right ]

             [ \--encoding[=<encoding>] ]
             [ \--(author|committer|grep)=<pattern> ]
             [ [\--objects | \--objects-edge] [ \--unpacked ] ]
             [ \--pretty | \--header ]
             [ \--bisect ]
             [ \--merge ]
             [ \--encoding[=<encoding>] ]
             [ \--(author|committer|grep)=<pattern> ]
             [ [\--objects | \--objects-edge] [ \--unpacked ] ]
             [ \--pretty | \--header ]
             [ \--bisect ]
             [ \--merge ]

+            [ \--reverse ]

             [ \--walk-reflogs ]
             <commit>... [ \-- <paths>... ]
 
             [ \--walk-reflogs ]
             <commit>... [ \-- <paths>... ]
 


@@ -99,6 +101,36 @@ include::pretty-formats.txt[]
 
        Print the parents of the commit.
 
 
        Print the parents of the commit.
 

+--left-right::
+
+       Mark which side of a symmetric diff a commit is reachable from.
+       Commits from the left side are prefixed with `<` and those from
+       the right with `>`.  If combined with `--boundary`, those
+       commits are prefixed with `-`.
++
+For example, if you have this topology:
++
+-----------------------------------------------------------------------
+             y---b---b  branch B
+            / \ /
+           /   .
+          /   / \
+         o---x---a---a  branch A
+-----------------------------------------------------------------------
++
+you would get an output line this:
++
+-----------------------------------------------------------------------
+       $ git rev-list --left-right --boundary --pretty=oneline A...B
+
+       >bbbbbbb... 3rd on b
+       >bbbbbbb... 2nd on b
+       <aaaaaaa... 3rd on a
+       <aaaaaaa... 2nd on a
+       -yyyyyyy... 1st on b
+       -xxxxxxx... 1st on a
+-----------------------------------------------------------------------
+

 Diff Formatting
 ~~~~~~~~~~~~~~~
 
 Diff Formatting
 ~~~~~~~~~~~~~~~
 


@@ -266,6 +298,10 @@ By default, the commits are shown in reverse chronological order.
        parent comes before all of its children, but otherwise things
        are still ordered in the commit timestamp order.
 
        parent comes before all of its children, but otherwise things
        are still ordered in the commit timestamp order.
 

+--reverse::
+
+       Output the commits in reverse order.
+

 Object Traversal
 ~~~~~~~~~~~~~~~~
 
 Object Traversal
 ~~~~~~~~~~~~~~~~