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

Re: [PATCH 0/7] New sequencer workflow!

From
Phil Hord <phil.hord@gmail.com>
Date
Nov 15, 2011, 15:46 UTC
Message-ID
<CABURp0qt+r09Uy_nfLd60pXiMMXgTOUB__XL-N=S7HaJa-oWoA@mail.gmail.com>
In-Reply-To
<1321181181-23923-1-git-send-email-artagnon@gmail.com>

On Sun, Nov 13, 2011 at 5:46 AM, Ramkumar Ramachandra <artagnon@gmail.com> wrote:

Show 9 quoted lines
>  $ git revert moo..baz
>  ... conflict ...
>  $ echo "resolved" >problematicfile
>  $ git add problematicfile
>  $ git sequencer --continue
>
> In other words, it just doesn't matter how you started what sequencing
> operation: you can always continue a it with "git sequencer
> --continue" and reset it with "git sequencer --reset".

I see that --reset was added to cherry-pick, revert and sequencer around the same time back in August. Shouldn't it be spelled "--abort" instead?

This would align better with other commands that do the same thing (am, merge, notes-merge, rebase) since they all appear to spell it "--abort". Also, it will make it easier in git 2.x when we begin using "git continue" and "git abort" rather than "git reset".

Phil
Previous: Ramkumar RamachandraNext: Ramkumar Ramachandra
Message 16 of 17 in “New sequencer workflow!”
  1. 0/7 New sequencer workflow!Ramkumar Ramachandra, Nov 13, 2011
  2. 1/7 sequencer: factor code out of revert builtinRamkumar Ramachandra, Nov 13, 2011
  3. 2/7 sequencer: invalidate sequencer state without todoRamkumar Ramachandra, Nov 13, 2011
  4. 3/7 sequencer: handle single-commit pick as special caseRamkumar Ramachandra, Nov 13, 2011
  5. Junio C HamanoNov 13, 2011
  6. Ramkumar RamachandraNov 15, 2011
  7. Junio C HamanoNov 15, 2011
  8. Ramkumar RamachandraNov 16, 2011
  9. 4/7 sequencer: handle cherry-pick conflict in last commitRamkumar Ramachandra, Nov 13, 2011
  10. 5/7 sequencer: introduce git-sequencer builtinRamkumar Ramachandra, Nov 13, 2011
  11. 6/7 sequencer: teach '--continue' how to commitRamkumar Ramachandra, Nov 13, 2011
  12. 7/7 sequencer: teach parser about CHERRY_PICK_HEADRamkumar Ramachandra, Nov 13, 2011
  13. Junio C HamanoNov 13, 2011
  14. Junio C HamanoNov 14, 2011
  15. Ramkumar RamachandraNov 15, 2011
  16. Phil HordNov 15, 2011
  17. Ramkumar RamachandraNov 15, 2011

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.