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 2f399461722f1420a0f733f2843a36d572b07f49..2be5bd659ac71914c5c6cf2e5abf00e59c1e9615 100755 (executable)
--- 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