X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin%2Frevert.c;h=4b47ace36b51566acb5b748f679070f02cbbf568;hb=e7cf4e94c6f147953af4d079ca2e9ef0d7a29ae9;hp=5ca81580d37b20e6f65fc8e8d1cdf09228f33ca1;hpb=ae76cb90cb835f9df42e849206ab55a1e1e1eea3;p=git.git

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";