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

[PATCH 0/5] sequencer: allow skipping commits

From
Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date
Jan 23, 2017, 22:52 UTC
Message-ID
<20170123225221.3659-1-giuseppe.bilotta@gmail.com>

This series introduces a few options to the sequencer, to allow skipping unwanted/unnecessary commits.

The first patch is just cleanup. The second fixes a potential issue about sequencing options not being correctly remembered across interruptions.

The next two introduce cherry-pick options to skip empty (or only redundant) commits. The two options are introduced separately because of the complexity associated with the possible combinations that can be had.

The last commit allows --skip as a reset + --continue, to quickly skip the current commit during a failed cherry-pick or revert (for example because a better version of the commit was already merged).

Giuseppe Bilotta (5):
  sequencer: sort options load/save by struct position
  sequencer: save/load all options
  cherry-pick: option to skip empty commits
  cherry-pick: allow skipping only redundant commits
  sequencer: allow to --skip current commit
 Documentation/git-cherry-pick.txt |  10 +++
 Documentation/sequencer.txt       |  10 ++-
 builtin/revert.c                  |  24 +++++-
 sequencer.c                       | 163 ++++++++++++++++++++++++++++++--------
 sequencer.h                       |   4 +-
 5 files changed, 176 insertions(+), 35 deletions(-)
-- 
2.11.0.616.gd72966cf44.dirty
Next: Giuseppe Bilotta
Message 1 of 6 in “sequencer: allow skipping commits”
  1. 0/5 sequencer: allow skipping commitsGiuseppe Bilotta, Jan 23, 2017
  2. 5/5 sequencer: allow to --skip current commitGiuseppe Bilotta, Jan 23, 2017
  3. 3/5 cherry-pick: option to skip empty commitsGiuseppe Bilotta, Jan 23, 2017
  4. 1/5 sequencer: sort options load/save by struct positionGiuseppe Bilotta, Jan 23, 2017
  5. 4/5 cherry-pick: allow skipping only redundant commitsGiuseppe Bilotta, Jan 23, 2017
  6. 2/5 sequencer: save/load all optionsGiuseppe Bilotta, Jan 23, 2017

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.