diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-02-25 16:43:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-25 16:43:30 -0800 |
| commit | 845d6030f81da3bb43bd24a78ef8c441a441c5d5 (patch) | |
| tree | 8f53740bbf5e31f6a002bc6166c897417e58696e /builtin/diff-tree.c | |
| parent | Merge branch 'mt/checkout-index-corner-cases' (diff) | |
| parent | diff: --{rotate,skip}-to=<path> (diff) | |
| download | tgif-845d6030f81da3bb43bd24a78ef8c441a441c5d5.tar.xz | |
Merge branch 'jc/diffcore-rotate'
"git {diff,log} --{skip,rotate}-to=<path>" allows the user to
discard diff output for early paths or move them to the end of the
output.
* jc/diffcore-rotate:
diff: --{rotate,skip}-to=<path>
Diffstat (limited to 'builtin/diff-tree.c')
| -rw-r--r-- | builtin/diff-tree.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c index 178d12f07f..f33d30d57b 100644 --- a/builtin/diff-tree.c +++ b/builtin/diff-tree.c @@ -156,6 +156,8 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix) if (merge_base && opt->pending.nr != 2) die(_("--merge-base only works with two commits")); + opt->diffopt.rotate_to_strict = 1; + /* * NOTE! We expect "a..b" to expand to "^a b" but it is * perfectly valid for revision range parser to yield "b ^a", @@ -192,6 +194,7 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix) int saved_nrl = 0; int saved_dcctc = 0; + opt->diffopt.rotate_to_strict = 0; if (opt->diffopt.detect_rename) { if (!the_index.cache) repo_read_index(the_repository); |