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

Re: git rebase --continue after solving conflicts doesn't work anymore

From
SMSebastián Mancilla <smancill.m@gmail.com>
Date
Feb 19, 2019, 14:25 UTC
Message-ID
<CAJPSwc3-=ByzxTQirg9==6G4tUcR+0Bzc0cfknOWNCmb6e8hCw@mail.gmail.com>
In-Reply-To
<CACsJy8Crn3mnXkwj_CQ1capeAXT=Jvn5S-HdnKsTLJZvdH=ObQ@mail.gmail.com>
No, it's not a typo. I just checked again.

That's the file that results when I start the rebase from tig (the Nix version), which results in the error for rebase --continue.

When I start the rebase manually or from tig (the Homebrew version) it has the quote.

        GIT_AUTHOR_NAME='Sebastián Mancilla'
        GIT_AUTHOR_EMAIL='smancill@jlab.org'
        GIT_AUTHOR_DATE='@1550530007 -0300'
Regards

El mar., 19 de feb. de 2019 a la(s) 11:15, Duy Nguyen (pclouds@gmail.com) escribió:

Show 13 quoted lines
>
> On Tue, Feb 19, 2019 at 9:04 PM Sebastián Mancilla <smancill.m@gmail.com> wrote:
> > And the content of .git/rebase-merge/author-script is always the same:
> >
> >         GIT_AUTHOR_NAME='Sebastián Mancilla'
> >         GIT_AUTHOR_EMAIL='smancill@jlab.org'
> >         GIT_AUTHOR_DATE='@1550530007 -0300
> >
>
> Just to be clear, the lack of closing quote on the last line is not a
> typo right?
> --
> Duy
-- 
Sebastian Mancilla
Previous: Duy NguyenNext: Christian Couder
Message 7 of 9 in “git rebase --continue after solving conflicts doesn't work anymore”
  1. Sebastián MancillaFeb 19, 2019
  2. Christian CouderFeb 19, 2019
  3. Eric SunshineFeb 19, 2019
  4. Phillip WoodFeb 19, 2019
  5. Sebastián MancillaFeb 19, 2019
  6. Duy NguyenFeb 19, 2019
  7. Sebastián MancillaFeb 19, 2019
  8. Christian CouderFeb 19, 2019
  9. Phillip WoodFeb 19, 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.