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 /builtin/merge-recursive.c | |
| parent | ff8ba59e7b015ba96d6a3271000f16aa71dc4a6f (diff) | |
| download | git-7610fa57e63b0acc0a66717fc2d85755634db591.tar.gz | |
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 'builtin/merge-recursive.c')
| -rw-r--r-- | builtin/merge-recursive.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c index d8875d5892..c2d4677fd3 100644 --- a/builtin/merge-recursive.c +++ b/builtin/merge-recursive.c @@ -45,6 +45,10 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix) o.subtree_shift = ""; else if (!prefixcmp(arg+2, "subtree=")) o.subtree_shift = arg + 10; + else if (!strcmp(arg+2, "renormalize")) + o.renormalize = 1; + else if (!strcmp(arg+2, "no-renormalize")) + o.renormalize = 0; else die("Unknown option %s", arg); continue; |