On Mon, Oct 29, 2012 at 02:12:32PM -0400, Phil Hord wrote: > >> (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). > > I think he is looking for this bit > "Merge made by the 'recursive' strategy." > > But he is seeing this instead: > "Automatic merge went well; stopped before committing as requested" > > Should the "what happened" output be silenced on --no-commit?
Ah. Yeah, we should not print "Merge made by the..." because we did not make a merge (and that message is part of the process to update the ref). But in verbose mode, we could probably say more about the on-going process (like which strategies we are trying). Patches welcome. -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
