From: Phil Hord <phil.hord@gmail.com>
To: Jeff King <peff@peff.net>
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 14:12:32 -0400 [thread overview]
Message-ID: <CABURp0oX5aT=yEbYeDXoOPWj_aRscVBY327_E6uyrrp5TPvcxA@mail.gmail.com> (raw)
In-Reply-To: <20121028112150.GD11434@sigill.intra.peff.net>
On Sun, Oct 28, 2012 at 7:21 AM, Jeff King <peff@peff.net> wrote:
> 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.
>
>> (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).
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?
Phil
next prev parent reply other threads:[~2012-10-29 18:13 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 [this message]
2012-10-29 21:51 ` Jeff King
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='CABURp0oX5aT=yEbYeDXoOPWj_aRscVBY327_E6uyrrp5TPvcxA@mail.gmail.com' \
--to=phil.hord@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--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).