diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-09-03 09:43:41 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-09-03 09:43:41 -0700 |
commit | 8aed4a5e38a2a4f31567e01ab2a73341e972c08a (patch) | |
tree | 349cd09847bc932588ca38634b75a65846f82751 /builtin/revert.c | |
parent | 22ffc39a0332e892ddbf16b39d9b611aff238d9b (diff) | |
parent | 7610fa57e63b0acc0a66717fc2d85755634db591 (diff) | |
download | git-8aed4a5e38a2a4f31567e01ab2a73341e972c08a.tar.gz git-8aed4a5e38a2a4f31567e01ab2a73341e972c08a.tar.xz |
Merge branch 'jn/merge-renormalize'
* jn/merge-renormalize:
merge-recursive --renormalize
rerere: never renormalize
rerere: migrate to parse-options API
t4200 (rerere): modernize style
ll-merge: let caller decide whether to renormalize
ll-merge: make flag easier to populate
Documentation/technical: document ll_merge
merge-trees: let caller decide whether to renormalize
merge-trees: push choice to renormalize away from low level
t6038 (merge.renormalize): check that it can be turned off
t6038 (merge.renormalize): try checkout -m and cherry-pick
t6038 (merge.renormalize): style nitpicks
Don't expand CRLFs when normalizing text during merge
Try normalizing files to avoid delete/modify conflicts when merging
Avoid conflicts when merging branches with mixed normalization
Conflicts:
builtin/rerere.c
t/t4200-rerere.sh
Diffstat (limited to 'builtin/revert.c')
-rw-r--r-- | builtin/revert.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/builtin/revert.c b/builtin/revert.c index 5ca81580d..4b47ace36 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -316,6 +316,13 @@ static int do_recursive_merge(struct commit *base, struct commit *next, index_fd = hold_locked_index(&index_lock, 1); read_cache(); + + /* + * NEEDSWORK: cherry-picking between branches with + * different end-of-line normalization is a pain; + * plumb in an option to set o.renormalize? + * (or better: arbitrary -X options) + */ init_merge_options(&o); o.ancestor = base ? base_label : "(empty tree)"; o.branch1 = "HEAD"; |