Re: git log omits deleting merges

2014-03-24 Thread Ephrim Khong
Am 20.03.14 20:54, schrieb Jeff King: On Thu, Feb 20, 2014 at 08:35:33AM +0100, Ephrim Khong wrote: Hi, git log seems to omit merge commits that delete a file if --follow or --diff-filter=D is given. Below is a testcase. I'm not sure if it is desired behaviour for --diff-filter=D, but it's

Re: git log omits deleting merges

2014-03-24 Thread Jeff King
On Mon, Mar 24, 2014 at 11:25:32AM +0100, Ephrim Khong wrote: Thank you for the explanation, I now understand why this is happening from a technical point of view. From a usability perspective, it is a bit confusing that a flag that should intuitively increase the number of shown commits

Re: git log omits deleting merges

2014-03-20 Thread Philip Oakley
From: Jeff King p...@peff.net On Thu, Feb 20, 2014 at 08:35:33AM +0100, Ephrim Khong wrote: Hi, git log seems to omit merge commits that delete a file if --follow or --diff-filter=D is given. Below is a testcase. I'm not sure if it is desired behaviour for --diff-filter=D, but it's probably

Re: git log omits deleting merges

2014-03-20 Thread Jeff King
On Thu, Mar 20, 2014 at 10:56:58PM -, Philip Oakley wrote: This is by design. Git-log does not calculate or show merge diffs unless -c or --cc is specified, and thus no diff-filter can match. This is hard to discern from the log(1) man page as this conflates commit inclusion

git log omits deleting merges

2014-02-19 Thread Ephrim Khong
Hi, git log seems to omit merge commits that delete a file if --follow or --diff-filter=D is given. Below is a testcase. I'm not sure if it is desired behaviour for --diff-filter=D, but it's probably not correct that --follow _removes_ the merge commit from the log output. Thanks - Eph --