diff options
| author |  Elijah Newren <newren@gmail.com> | 2020-08-03 18:41:19 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-08-03 11:48:15 -0700 |
| commit | 8d552258f45ba3886e8d508ece8585b509a04677 (patch) | |
| tree | bc42b9dd566d13f8f3e1e8174bdd531b0d6c4275 /Documentation/git-show.txt | |
| parent | t6038: remove problematic test (diff) | |
| download | tgif-8d552258f45ba3886e8d508ece8585b509a04677.tar.xz | |
merge: make merge.renormalize work for all uses of merge machinery
The 'merge' command is not the only one that does merges; other commands
like checkout -m or rebase do as well. Unfortunately, the only area of
the code that checked for the "merge.renormalize" config setting was in
builtin/merge.c, meaning it could only affect merges performed by the
"merge" command. Move the handling of this config setting to
merge_recursive_config() so that other commands can benefit from it as
well. Fixes a few tests in t6038.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-show.txt')
0 files changed, 0 insertions, 0 deletions