Re: git-feed-mail-list.sh

Linus Torvalds [off-list ref] writes:

On Tue, 9 May 2006, Bertrand Jacquin wrote:

quoted

On 5/9/06, Linus Torvalds [off-list ref] wrote:

quoted

Ie you could probably more easily parse the data from something like

        git show -B --patch-with-stat --pretty=fuller $commit

Is there a way to track merge like that ? Documentation is not very
clear and near from empty.

Sure.

If you want to track merges and get their patches, add the "--cc" flag, 
which tells git to use the "conflict combination patch" that shows any 
visible conflicts.

Actually, show defaults to --cc so what's shown is good as is.

That said, the diffstat for merges is usually just a lot of noise. It's 
sometimes nice (you've merged from a topic branch), but if you have merged 
from the mainline _into_ a topic branch, it's just annoying.

True.  We made --cc --patch-with-stat to do the combined patch
text with diffstat for first-parent-diff to make it most natural
for merging into upstream, not merging from upstream.