| commit | 328539987b327e01a8dc21cbfae71f3233dad492 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 15 Apr 2014 23:14:36 +0000 (15 16:14 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 16 Apr 2014 17:28:24 +0000 (16 10:28 -0700) | ||
| tree | ccb694817dc2d1bfbf5239a05595d118b5ffe794 | treesnapshot (tar.gz zip) |
| parent | 5827fd485c816ff78c3c5c46752cf18acf49d2e4 | commitdiff |
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.
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 | diffblobblamehistory |