diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-05 06:32:41 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-06 09:20:02 -0700 |
| commit | 7610fa57e63b0acc0a66717fc2d85755634db591 (patch) | |
| tree | 068161cdd6ca96746439efda939c4d15beba190d /merge-recursive.c | |
| parent | ff8ba59e7b015ba96d6a3271000f16aa71dc4a6f (diff) | |
| download | git-7610fa57e63b0acc0a66717fc2d85755634db591.tar.gz git-7610fa57e63b0acc0a66717fc2d85755634db591.tar.xz | |
merge-recursive --renormalize
Teach "git merge-recursive" a --renormalize option to enable the
merge.renormalize configuration. The --no-renormalize option can
be used to override it in the negative.
So in the future, you might be able to, e.g.:
git checkout -m -Xrenormalize otherbranch
or
git revert -Xrenormalize otherpatch
or
git pull --rebase -Xrenormalize
The bad part: merge.renormalize is still not honored for most
commands. And it reveals lots of places that -X has not been plumbed
in (so we get "git merge -Xrenormalize" but not much else).
NEEDSWORK: tests
Cc: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 23f7a4d13..762b5494d 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1486,7 +1486,7 @@ void init_merge_options(struct merge_options *o) o->buffer_output = 1; o->diff_rename_limit = -1; o->merge_rename_limit = -1; - o->renormalize = merge_renormalize; + o->renormalize = 0; git_config(merge_recursive_config, o); if (getenv("GIT_MERGE_VERBOSITY")) o->verbosity = |