[PATCH v4 00/15] complete reroll of my "port rebase -i to C" series
- From
Christian Couder <chriscool@tuxfamily.org>
- Date
- Aug 28, 2009, 04:47 UTC
- Message-ID
- <20090828043913.4307.34708.chriscool@tuxfamily.org>
So unlike previous series, this is a complete reroll of all my previous patches to port rebase -i to C using code from the sequencer project.
The main changes are in the commit messages that I tried to improve according to Junio's feedback. But some patches were also squashed together and there are a few minor changes too:
- comments have been added before the pick_commit() function (patch 11/15: revert: libify cherry-pick and revert functionnality),
- and a line in the usage message as been removed from patch 13/15 (sequencer: add "do_commit()" and related functions) because it should be added by the next patch instead.
Christian Couder (9): sequencer: add "builtin-sequencer--helper.c" rebase -i: use "git sequencer--helper --make-patch" sequencer: add "--reset-hard" option to "git sequencer--helper" rebase -i: use "git sequencer--helper --reset-hard" sequencer: add "--fast-forward" option to "git sequencer--helper" sequencer: let "git sequencer--helper" callers set "allow_dirty" rebase -i: use "git sequencer--helper --fast-forward" pick: libify "pick_help_msg()" rebase -i: use "git sequencer--helper --cherry-pick"
Stephan Beyer (6):
sequencer: add "make_patch" function to save a patch
sequencer: add "reset_almost_hard()" and related functions
sequencer: add "do_fast_forward()" to perform a fast forward
revert: libify cherry-pick and revert functionnality
sequencer: add "do_commit()" and related functions working on
"next_commit"
sequencer: add "--cherry-pick" option to "git sequencer--helper".gitignore | 1 + Makefile | 3 + builtin-revert.c | 293 ++++-------------------- builtin-sequencer--helper.c | 543 +++++++++++++++++++++++++++++++++++++++++++ builtin.h | 1 + git-rebase--interactive.sh | 42 ++-- git.c | 1 + pick.c | 240 +++++++++++++++++++ pick.h | 14 ++ 9 files changed, 865 insertions(+), 273 deletions(-) create mode 100644 builtin-sequencer--helper.c create mode 100644 pick.c create mode 100644 pick.h