mirror of
https://github.com/git/git.git
synced 2026-01-16 21:59:45 +00:00
328539987b
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.
The compare-cooking.perl script is meant to help viewing the differences
between periodical "What's cooking" messages, and can be used as an
external diff driver by:
$ git config diff.whatscooking.command ./compare-cooking.perl
to produce this section in your .git/config
[diff "whatscooking"]
command = ./compare-cooking.perl
You can use e.g.
$ git log -p --ext-diff whats-cooking.txt
$ git show --ext-diff whats-cooking.txt
to review the history.