From: Jonathan del Strother <maillist@steelskies.com>
To: git@vger.kernel.org
Subject: Re: [PATCH] Offer to print changes while running git-mergetool
Date: Fri, 6 Feb 2009 14:41:45 +0000 [thread overview]
Message-ID: <57518fd10902060641pa789ffbjceccbf013864e0a5@mail.gmail.com> (raw)
In-Reply-To: <1233930745-77930-1-git-send-email-jon.delStrother@bestbefore.tv>
On Fri, Feb 6, 2009 at 2:32 PM, Jonathan del Strother
<jon.delStrother@bestbefore.tv> wrote:
> Add a "Show changes" option to each prompt in mergetool. This prints the conflicted changes on the current file, using 'git log -p --merge <file>'
Just discovered that this doesn't work so well when resolving merges
resulting from "git stash apply" - it produces "fatal: --merge without
MERGE_HEAD". Should git-stash be setting MERGE_HEAD in this case, or
should I be using something other than 'git log --merge' to cover
these sorts of cases?
next prev parent reply other threads:[~2009-02-06 14:43 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-06 14:32 [PATCH] Offer to print changes while running git-mergetool Jonathan del Strother
2009-02-06 14:41 ` Jonathan del Strother [this message]
2009-02-06 17:47 ` Junio C Hamano
2009-02-06 19:08 ` Jonathan del Strother
2009-02-07 0:21 ` Junio C Hamano
2009-02-07 8:11 ` Junio C Hamano
2009-02-07 12:01 ` Jonathan del Strother
2009-02-08 1:24 ` Charles Bailey
2009-02-08 11:43 ` Jonathan del Strother
2009-02-08 12:38 ` Charles Bailey
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=57518fd10902060641pa789ffbjceccbf013864e0a5@mail.gmail.com \
--to=maillist@steelskies.com \
--cc=git@vger.kernel.org \
/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.
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 NNTP newsgroup(s).