From: Jeff King <peff@peff.net>
To: Phil Hord <phil.hord@gmail.com>
Cc: "Scott R. Godin" <scottg.wp-hackers@mhg2.com>, git@vger.kernel.org
Subject: Re: merge --no-commit not able to report stats more verbosely?
Date: Mon, 29 Oct 2012 17:51:54 -0400 [thread overview]
Message-ID: <20121029215154.GE20513@sigill.intra.peff.net> (raw)
In-Reply-To: <CABURp0oX5aT=yEbYeDXoOPWj_aRscVBY327_E6uyrrp5TPvcxA@mail.gmail.com>
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
prev parent reply other threads:[~2012-10-29 21:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-22 13:39 merge --no-commit not able to report stats more verbosely? Scott R. Godin
2012-10-26 17:18 ` Scott R. Godin
2012-10-28 11:21 ` Jeff King
2012-10-29 18:12 ` Phil Hord
2012-10-29 21:51 ` Jeff King [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121029215154.GE20513@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=phil.hord@gmail.com \
--cc=scottg.wp-hackers@mhg2.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).