Re: merge --no-commit not able to report stats more verbosely?

From: Jeff King <peff@peff.net>
Date: Oct 28, 2012, 11:21 UTC
Message-ID: <20121028112150.GD11434@sigill.intra.peff.net>
In-Reply-To: <k63iai$kbp$1@ger.gmane.org>

On Mon, Oct 22, 2012 at 09:39:31AM -0400, Scott R. Godin wrote:

> As you can see from the below, I can't seem to get it to give me more
> verbose results of what's being merged (as in the actual merge below)
> with --stat or -v .. is it supposed to do that?

Yes. The diffstat is shown for the completed merge, but here:

> (develop)>$ git merge --no-commit --stat -v widget_twitter
> Automatic merge went well; stopped before committing as requested

You do not complete the merge.

Show 6 quoted lines

> (develop|MERGING)>$ git merge --abort
> 
> (develop)>$ git merge widget_twitter
> Merge made by the 'recursive' strategy.
>  .../code/community/Dnd/Magentweet/Model/User.php   |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)

Whereas here you do, and you get a diffstat.

When you are in the middle of an uncompleted merge and want to know what is happening, you should look at the index using "git status" (to get an overview of what is ready to be committed and what is unmerged), "git diff --cached" (to see what was automatically merged and is ready for commit), and "git diff" (to see conflicted entries that still need to be resolved).

-Peff