From 328539987b327e01a8dc21cbfae71f3233dad492 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 15 Apr 2014 16:14:36 -0700 Subject: [PATCH] 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. --- Reintegrate | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 -- 2.47.3