mirror of
https://github.com/git/git.git
synced 2026-01-26 08:47:20 +09:00
da6e86d371
Even though the paragraph before this one is pretty clear that topics are first merged to 'master' and then to 'maint', it was misleading to say 'maint' is merged to 'master' to propagate fixes forward, as most of the time, such an upmerge is a noop because topics merged to 'maint' are usually merged to 'master' already. These up-merges are done primarily to make sure that the tip of 'master' has updated release notes from all the maintenance tracks, so be explicit about that to avoid confusion. Signed-off-by: Junio C Hamano <gitster@pobox.com>
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.