Package: git-man
Version: 1:2.0.0~rc2-1
Severity: minor
Tags: upstream
git-log(1) explains:
-c
With this option, diff output for a merge commit shows the
differences from each of the parents to the merge result
simultaneously instead of showing pairwise diff between a
parent and the result one at a time. Furthermore, it lists
only files which were modified from all parents.
--cc
This flag implies the -c option and further compresses the
patch output by omitting uninteresting hunks whose contents in
the parents have only two variants and the merge result picks
one of them without modification.
But in fact that happens at the file level instead of the hunk level
unless -p is also passed (which is a nice behavior but should be
documented).
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
