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

[PATCH 0/2] A couple of cherry-pick related fixes

From
PWPhillip Wood <phillip.wood123@gmail.com>
Date
Mar 29, 2019, 16:30 UTC
Message-ID
<20190329163009.493-1-phillip.wood123@gmail.com>
From: Phillip Wood <phillip.wood@dunelm.org.uk>

See the actual patches for a description of the fixes, I'm not sure about the second one, see the notes on it. I'm going to be mostly off-line for the next couple of weeks so it might take me a while to respond to any comments.

Phillip Wood (2):
  commit/reset: try to clean up sequencer state
  fix cherry-pick/revert status after commit
 branch.c                        |  7 ++--
 builtin/commit.c                |  7 ++--
 sequencer.c                     | 60 +++++++++++++++++++++++++++++++++
 sequencer.h                     |  3 ++
 t/t3507-cherry-pick-conflict.sh | 19 +++++++++++
 t/t7512-status-help.sh          | 19 +++++++++++
 wt-status.c                     | 12 ++++++-
 7 files changed, 122 insertions(+), 5 deletions(-)
-- 
2.21.0
Next: Phillip Wood
Message 1 of 15 in “A couple of cherry-pick related fixes”
  1. 0/2 A couple of cherry-pick related fixesPhillip Wood, Mar 29, 2019
  2. 1/2 commit/reset: try to clean up sequencer statePhillip Wood, Mar 29, 2019
  3. Junio C HamanoApr 1, 2019
  4. Phillip WoodApr 8, 2019
  5. Duy NguyenApr 1, 2019
  6. Phillip WoodApr 8, 2019
  7. 2/2 fix cherry-pick/revert status after commitPhillip Wood, Mar 29, 2019
  8. Junio C HamanoApr 1, 2019
  9. Phillip WoodApr 8, 2019
  10. 0/2 A couple of cherry-pick related fixesPhillip Wood, Apr 16, 2019
  11. 2/2 fix cherry-pick/revert status after commitPhillip Wood, Apr 16, 2019
  12. 1/2 commit/reset: try to clean up sequencer statePhillip Wood, Apr 16, 2019
  13. Junio C HamanoApr 17, 2019
  14. Johannes SchindelinApr 17, 2019
  15. Phillip WoodApr 17, 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.