Re: [PATCH 00/26] git-log: implement new --diff-merge options

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Elijah Newren <newren@xxxxxxxxx> writes:

> ... I guess I'm not sure why one would ever
> want to see diffs for merges and not for normal commits.  Even in the
> unusual case someone did, couldn't they just pass --merges (to strip
> out the normal commits entirely)?

Giving "--merges" would skip the single-strand-of-pearls commits
entirely, not even showing their log messages, so it won't be an
equivalent substitute.

> Honestly, I find it a little surprising that despite the fact that log
> -p shows nothing for merge commits, that when I add --first-parent to
> see a subset of commits I suddenly get weird, huge diffs shown for the
> merges (yeah, yeah, I learned recently that it's documented behavior,
> so it's not surprising anymore, just weird).

I view "--first-parent" as telling "git log" to pretend all merges
are single-parent commits (as if you did squash merges), and it is a
natural consequence if "log --first-parent -p" showed each commit
with its first parent, whether it is a merge or a single-parent
commit.



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux