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
Duy Nguyen <pclouds@gmail.com>
Date
Feb 19, 2019, 14:14 UTC
Message-ID
<CACsJy8Crn3mnXkwj_CQ1capeAXT=Jvn5S-HdnKsTLJZvdH=ObQ@mail.gmail.com>
In-Reply-To
<CAJPSwc0Xu=HoF5XrqnFj_1ZrshM3HFb78tJkXOTWZ=HJX8Akgg@mail.gmail.com>
On Tue, Feb 19, 2019 at 9:04 PM Sebastián Mancilla <smancill.m@gmail.com> wrote:
Show 6 quoted lines
> 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
Previous: Sebastián MancillaNext: Sebastián Mancilla
Message 6 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.