diff options
| author | Brian Gernhardt <benji@silverinsanity.com> | 2007-04-05 10:53:07 -0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-05 14:12:41 -0700 |
| commit | b24bace5ca9420033be83ef6c14fb092c9371fe1 (patch) | |
| tree | 04d53cfcc722d464842b131c0633e48e1a3b5d07 | |
| parent | 265d528032e55c48798266c538d3e6338cb1e2b6 (diff) | |
| download | git-b24bace5ca9420033be83ef6c14fb092c9371fe1.tar.gz git-b24bace5ca9420033be83ef6c14fb092c9371fe1.tar.xz | |
Document --left-right option to rev-list.
Explanation is paraphrased from "577ed5c... rev-list --left-right"
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Documentation/git-rev-list.txt | 31 | ||||
| -rw-r--r-- | builtin-rev-list.c | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt index 4f145eaba..11ce395c9 100644 --- a/Documentation/git-rev-list.txt +++ b/Documentation/git-rev-list.txt @@ -21,6 +21,7 @@ SYNOPSIS [ \--stdin ] [ \--topo-order ] [ \--parents ] + [ \--left-right ] [ \--encoding[=<encoding>] ] [ \--(author|committer|grep)=<pattern> ] [ [\--objects | \--objects-edge] [ \--unpacked ] ] @@ -100,6 +101,36 @@ include::pretty-formats.txt[] 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 --git a/builtin-rev-list.c b/builtin-rev-list.c index 51858e323..b86e7ca8b 100644 --- a/builtin-rev-list.c +++ b/builtin-rev-list.c @@ -35,6 +35,7 @@ static const char rev_list_usage[] = " --header | --pretty\n" " --abbrev=nr | --no-abbrev\n" " --abbrev-commit\n" +" --left-right\n" " special purpose:\n" " --bisect" ; |