From: Jeff King <peff@peff.net>
Date: Fri, 12 Sep 2014 02:26:01 GMT
Subject: Re: Is the a way to get a log with files that were changed
Message-ID: <20140912022600.GA15519@peff.net>
In-Reply-To: <FD6D2EE2-AD97-4D40-B461-435FD18D7E1A@gmail.com>

On Fri, Sep 12, 2014 at 07:16:26AM +0530, Stephen Smith wrote:

> Is there a way to get a log of first parent  commits and with each
> commit a entry a list of the files that were changed?

How about:

  git log --first-parent -m --name-only

The "--first-parent" restricts the traversal. The "-m" tells git to show
merge diffs against their parents. We show only the diff against the
first parent due to "--first-parent", so we effectively show the diff of
what was brought in by the merge. And then "--name-only" can be replaced
with "--raw", "-p", or whatever diff format you prefer.

-Peff