diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-18 01:21:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-18 01:21:41 (GMT) |
| commit | dadc91ff0c15b655070ad334a27a734e91635bd5 (patch) | |
| tree | c53f828a0941fae682ee087bd21e935de607e2e5 /Documentation | |
| parent | 77348b0e6e350ec81b3880f99c6077d165df2276 (diff) | |
| parent | 1e79f973266cfe0e3bab0e26e869b682078e457d (diff) | |
| download | git-dadc91ff0c15b655070ad334a27a734e91635bd5.zip git-dadc91ff0c15b655070ad334a27a734e91635bd5.tar.gz git-dadc91ff0c15b655070ad334a27a734e91635bd5.tar.bz2 | |
Merge branch 'js/range-diff-one-side-only'
The "git range-diff" command learned "--(left|right)-only" option
to show only one side of the compared range.
* js/range-diff-one-side-only:
range-diff: offer --left-only/--right-only options
range-diff: move the diffopt initialization down one layer
range-diff: combine all options in a single data structure
range-diff: simplify code spawning `git log`
range-diff: libify the read_patches() function again
range-diff: avoid leaking memory in two error code paths
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-range-diff.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/git-range-diff.txt b/Documentation/git-range-diff.txt index a968d52..fe350d7 100644 --- a/Documentation/git-range-diff.txt +++ b/Documentation/git-range-diff.txt @@ -10,6 +10,7 @@ SYNOPSIS [verse] 'git range-diff' [--color=[<when>]] [--no-color] [<diff-options>] [--no-dual-color] [--creation-factor=<factor>] + [--left-only | --right-only] ( <range1> <range2> | <rev1>...<rev2> | <base> <rev1> <rev2> ) DESCRIPTION @@ -68,6 +69,14 @@ to revert to color all lines according to the outer diff markers See the ``Algorithm`` section below for an explanation why this is needed. +--left-only:: + Suppress commits that are missing from the first specified range + (or the "left range" when using the `<rev1>...<rev2>` format). + +--right-only:: + Suppress commits that are missing from the second specified range + (or the "right range" when using the `<rev1>...<rev2>` format). + --[no-]notes[=<ref>]:: This flag is passed to the `git log` program (see linkgit:git-log[1]) that generates the patches. |