From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 15 Apr 2014 23:14:36 +0000 (-0700)
Subject: Meta/Reintegrate: pass custom merge options
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=328539987b327e01a8dc21cbfae71f3233dad492;p=thirdparty%2Fgit.git

Meta/Reintegrate: pass custom merge options

While rebuilding an integration branch, some topics may need custom
merge options, such as -Xsubtree=where/, to explicitly tell where
that foreign history sits in our tree.  Teach the Reintegrate script
to pay attention to branch.$name.rebuild configuration, e.g.

	[branch "jl/git-gui-show-added-submodule-changes"]
		rebuild = -Xsubtree=git-gui/

to allow customization.
---

diff --git a/Reintegrate b/Reintegrate
index 2f39946172..2be5bd659a 100755
--- a/Reintegrate
+++ b/Reintegrate
@@ -149,7 +149,9 @@ no)
 
 			mark_cut
 
-			EDITOR=: git merge $accept_rerere --edit "$branch" ||
+			rebuild=$(git config "branch.$branch.rebuild" || :)
+
+			EDITOR=: git merge $rebuild $accept_rerere --edit "$branch" ||
 			accept_rerere ||
 			exit