mirror of
https://github.com/git/git.git
synced 2026-01-12 13:53:11 +09:00
2dc125e01b
A typical entry in whats-cooking.txt begins with the description of the topic, followed by "Will do what to this topic" declaration of the decision (i.e. $willdo verb) and supplemental text to explain the decision. When we read such an entry to add to a merge log message, we omit the line with "Will do what". Instead, stop reading there to exclude the supplemental text from the merge log.
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.