Merge branch 'mg/rev-list-one-side-only'
* mg/rev-list-one-side-only: git-log: put space after commit mark t6007: test rev-list --cherry log --cherry: a synonym rev-list: documentation and test for --cherry-mark revision.c: introduce --cherry-mark rev-list/log: factor out revision mark generation rev-list: --left/right-only are mutually exclusive rev-list: documentation and test for --left/right-only t6007: Make sure we test --cherry-pick revlist.c: introduce --left/right-only for unsymmetric picking
This commit is contained in:
@ -31,6 +31,9 @@ SYNOPSIS
|
||||
[ \--parents ]
|
||||
[ \--timestamp ]
|
||||
[ \--left-right ]
|
||||
[ \--left-only ]
|
||||
[ \--right-only ]
|
||||
[ \--cherry-mark ]
|
||||
[ \--cherry-pick ]
|
||||
[ \--encoding[=<encoding>] ]
|
||||
[ \--(author|committer|grep)=<pattern> ]
|
||||
|
@ -151,6 +151,11 @@ ifdef::git-rev-list[]
|
||||
to /dev/null as the output does not have to be formatted.
|
||||
endif::git-rev-list[]
|
||||
|
||||
--cherry-mark::
|
||||
|
||||
Like `--cherry-pick` (see below) but mark equivalent commits
|
||||
with `=` rather than omitting them, and inequivalent ones with `+`.
|
||||
|
||||
--cherry-pick::
|
||||
|
||||
Omit any commit that introduces the same change as
|
||||
@ -165,6 +170,27 @@ from the other branch (for example, "3rd on b" may be cherry-picked
|
||||
from branch A). With this option, such pairs of commits are
|
||||
excluded from the output.
|
||||
|
||||
--left-only::
|
||||
--right-only::
|
||||
|
||||
List only commits on the respective side of a symmetric range,
|
||||
i.e. only those which would be marked `<` resp. `>` by
|
||||
`--left-right`.
|
||||
+
|
||||
For example, `--cherry-pick --right-only A...B` omits those
|
||||
commits from `B` which are in `A` or are patch-equivalent to a commit in
|
||||
`A`. In other words, this lists the `{plus}` commits from `git cherry A B`.
|
||||
More precisely, `--cherry-pick --right-only --no-merges` gives the exact
|
||||
list.
|
||||
|
||||
--cherry::
|
||||
|
||||
A synonym for `--right-only --cherry-mark --no-merges`; useful to
|
||||
limit the output to the commits on our side and mark those that
|
||||
have been applied to the other side of a forked history with
|
||||
`git log --cherry upstream...mybranch`, similar to
|
||||
`git cherry upstream mybranch`.
|
||||
|
||||
-g::
|
||||
--walk-reflogs::
|
||||
|
||||
|
Reference in New Issue
Block a user