git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Jeff King <peff@peff.net>
Date
Oct 29, 2012, 21:51 UTC
Message-ID
<20121029215154.GE20513@sigill.intra.peff.net>
In-Reply-To
<CABURp0oX5aT=yEbYeDXoOPWj_aRscVBY327_E6uyrrp5TPvcxA@mail.gmail.com>
On Mon, Oct 29, 2012 at 02:12:32PM -0400, Phil Hord wrote:
Show 21 quoted lines
> >> (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
Previous: Phil Hord
Message 5 of 5 in “merge --no-commit not able to report stats more verbosely?”
  1. Scott R. GodinOct 22, 2012
  2. Scott R. GodinOct 26, 2012
  3. Jeff KingOct 28, 2012
  4. Phil HordOct 29, 2012
  5. Jeff KingOct 29, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.