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

Re: [PATCH 2/2] merge: add --quit

From
Emily Shaffer <emilyshaffer@google.com>
Date
May 2, 2019, 21:49 UTC
Message-ID
<20190502214935.GA116416@google.com>
In-Reply-To
<20190501131152.314-3-pclouds@gmail.com>

They both look fine to me, besides a couple typos in the commit message in this one.

On Wed, May 01, 2019 at 08:11:52PM +0700, Nguyễn Thái Ngọc Duy wrote:
> This allows to cancel the current merge without reseting worktree/index,
"resetting".
> which is what --abort is for. Like other --quit(s), this is often used
> when you forgot that you're in the middle of a merge and already
> switched away, doing different things. By the time you're realize, you
"By the time you've realized" ?
> can't even continue the merge anymore.

Thanks, Emily

Previous: Nguyễn Thái Ngọc DuyNext: Phillip Wood
Message 4 of 20 in “Add "git merge --quit"”
  1. 0/2 Add "git merge --quit"Nguyễn Thái Ngọc Duy, May 1, 2019
  2. 1/2 merge: remove drop_save() in favor of remove_merge_branch_state()Nguyễn Thái Ngọc Duy, May 1, 2019
  3. 2/2 merge: add --quitNguyễn Thái Ngọc Duy, May 1, 2019
  4. Emily ShafferMay 2, 2019
  5. Phillip WoodMay 2, 2019
  6. 0/2 nd/merge-quit updateNguyễn Thái Ngọc Duy, May 9, 2019
  7. 1/2 merge: remove drop_save() in favor of remove_merge_branch_state()Nguyễn Thái Ngọc Duy, May 9, 2019
  8. 2/2 merge: add --quitNguyễn Thái Ngọc Duy, May 9, 2019
  9. 0/2 nd/merge-quit updatesNguyễn Thái Ngọc Duy, May 14, 2019
  10. 1/2 merge: remove drop_save() in favor of remove_merge_branch_state()Nguyễn Thái Ngọc Duy, May 14, 2019
  11. 2/2 merge: add --quitNguyễn Thái Ngọc Duy, May 14, 2019
  12. Johannes SchindelinMay 14, 2019
  13. Junio C HamanoMay 15, 2019
  14. Johannes SchindelinMay 15, 2019
  15. Junio C HamanoMay 15, 2019
  16. 0/2 nd/merge-quit updatesNguyễn Thái Ngọc Duy, May 18, 2019
  17. 1/2 merge: remove drop_save() in favor of remove_merge_branch_state()Nguyễn Thái Ngọc Duy, May 18, 2019
  18. 2/2 merge: add --quitNguyễn Thái Ngọc Duy, May 18, 2019
  19. Johannes SchindelinMay 20, 2019
  20. Johannes SchindelinMay 20, 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.