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

Re: [BUG] "--show-current-patch" return a mail instead of a patch

From
Jerome Pouiller <jerome.pouiller@silabs.com>
Date
Oct 23, 2019, 12:47 UTC
Message-ID
<2928191.nfgCUvMfDQ@pc-42>
In-Reply-To
<20191023110951.GA716725@generichostname>
On Wednesday 23 October 2019 13:09:51 CEST Denton Liu wrote:
Show 10 quoted lines
> 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
Previous: Denton Liu
Message 7 of 7 in “[BUG] "--show-current-patch" return a mail instead of a patch”
  1. Jerome PouillerOct 22, 2019
  2. Junio C HamanoOct 23, 2019
  3. Jerome PouillerOct 23, 2019
  4. Denton LiuOct 23, 2019
  5. Jerome PouillerOct 23, 2019
  6. Denton LiuOct 23, 2019
  7. Jerome PouillerOct 23, 2019

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.