From: Jerome Pouiller <Jerome.Pouiller@silabs.com>
To: Denton Liu <liu.denton@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [BUG] "--show-current-patch" return a mail instead of a patch
Date: Wed, 23 Oct 2019 12:47:39 +0000 [thread overview]
Message-ID: <2928191.nfgCUvMfDQ@pc-42> (raw)
In-Reply-To: <20191023110951.GA716725@generichostname>
On Wednesday 23 October 2019 13:09:51 CEST Denton Liu wrote:
> On Wed, Oct 23, 2019 at 10:15:15AM +0000, Jerome Pouiller wrote:
> > On Wednesday 23 October 2019 10:55:03 CEST Denton Liu wrote:
> > > I am currently have a WIP patchset that will print the location of the
> > > failed patch file (.git/rebase-apply/patch) in the case of a failure as
> > > well as the line number. Will this be sufficient for your purposes?
> >
> > It would be a clear improvement (the perfection would be to be able to
> > use mergetool with git-am :) ).
>
> You should be able to do that with the --3way (-3) flag.
AFAIK, it only works if index is found in local repository, which is
rarely the case :(
--
Jérôme Pouiller
prev parent reply other threads:[~2019-10-23 12:47 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-22 10:18 [BUG] "--show-current-patch" return a mail instead of a patch Jerome Pouiller
2019-10-23 2:24 ` Junio C Hamano
2019-10-23 8:49 ` Jerome Pouiller
2019-10-23 8:55 ` Denton Liu
2019-10-23 10:15 ` Jerome Pouiller
2019-10-23 11:09 ` Denton Liu
2019-10-23 12:47 ` Jerome Pouiller [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2928191.nfgCUvMfDQ@pc-42 \
--to=jerome.pouiller@silabs.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=liu.denton@gmail.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.