зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
265d528032
Коммит
b24bace5ca
|
@ -21,6 +21,7 @@ SYNOPSIS
|
||||||
[ \--stdin ]
|
[ \--stdin ]
|
||||||
[ \--topo-order ]
|
[ \--topo-order ]
|
||||||
[ \--parents ]
|
[ \--parents ]
|
||||||
|
[ \--left-right ]
|
||||||
[ \--encoding[=<encoding>] ]
|
[ \--encoding[=<encoding>] ]
|
||||||
[ \--(author|committer|grep)=<pattern> ]
|
[ \--(author|committer|grep)=<pattern> ]
|
||||||
[ [\--objects | \--objects-edge] [ \--unpacked ] ]
|
[ [\--objects | \--objects-edge] [ \--unpacked ] ]
|
||||||
|
@ -100,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
|
||||||
~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
|
|
@ -35,6 +35,7 @@ static const char rev_list_usage[] =
|
||||||
" --header | --pretty\n"
|
" --header | --pretty\n"
|
||||||
" --abbrev=nr | --no-abbrev\n"
|
" --abbrev=nr | --no-abbrev\n"
|
||||||
" --abbrev-commit\n"
|
" --abbrev-commit\n"
|
||||||
|
" --left-right\n"
|
||||||
" special purpose:\n"
|
" special purpose:\n"
|
||||||
" --bisect"
|
" --bisect"
|
||||||
;
|
;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче