diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-02-11 11:57:50 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-02-16 09:30:42 -0800 |
commit | 1eb4136ac2a24764257567b930535fcece01719f (patch) | |
tree | 7a8abfa8d2beabee2f3260c001eff7a7335c5166 /builtin/diff.c | |
parent | Merge branch 'tb/ci-run-cocci-with-18.04' (diff) | |
download | tgif-1eb4136ac2a24764257567b930535fcece01719f.tar.xz |
diff: --{rotate,skip}-to=<path>
In the implementation of "git difftool", there is a case where the
user wants to start viewing the diffs at a specific path and
continue on to the rest, optionally wrapping around to the
beginning. Since it is somewhat cumbersome to implement such a
feature as a post-processing step of "git diff" output, let's
support it internally with two new options.
- "git diff --rotate-to=C", when the resulting patch would show
paths A B C D E without the option, would "rotate" the paths to
shows patch to C D E A B instead. It is an error when there is
no patch for C is shown.
- "git diff --skip-to=C" would instead "skip" the paths before C,
and shows patch to C D E. Again, it is an error when there is no
patch for C is shown.
- "git log [-p]" also accepts these two options, but it is not an
error if there is no change to the specified path. Instead, the
set of output paths are rotated or skipped to the specified path
or the first path that sorts after the specified path.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/diff.c')
-rw-r--r-- | builtin/diff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/diff.c b/builtin/diff.c index 5cfe1717e8..f1b88c7389 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -491,6 +491,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix) } rev.diffopt.flags.recursive = 1; + rev.diffopt.rotate_to_strict = 1; setup_diff_pager(&rev.diffopt); |