Changes since v1:
* Resurrect --no-keep-empty (for commits which begin empty), which can be
used orthogonally to --empty (for commits which become empty). Docs
updated as well
* Add a commit improving the error message for --apply being used with
non-apply arguments
I wanted to base this commit on jt/rebase-allow-duplicate, in particular to
add a patch moving his new --[no-]keep-cherry-picks arguments to be close to
the --empty={drop,keep,ask} and --[no-]keep-empty flags, since all three are
related. But unfortunately that series was based on 2.25, and my series
needs to be based on 2.26. So, for now, I'm just keeping the two series
independent and will submit a fixup patch after these two are both merged
down to move all the arguments near each other.
Elijah Newren (3):
rebase -i: mark commits that begin empty in todo editor
rebase: reinstate --no-keep-empty
rebase: fix an incompatible-options error message
Documentation/git-rebase.txt | 36 +++++++++++++++++--------------
builtin/rebase.c | 17 +++++++++------
sequencer.c | 11 ++++++++++
sequencer.h | 2 +-
t/t3421-rebase-topology-linear.sh | 10 ++++-----
t/t3424-rebase-empty.sh | 36 +++++++++++++++++++++++++++++++
6 files changed, 82 insertions(+), 30 deletions(-)
base-commit: 274b9cc25322d9ee79aa8e6d4e86f0ffe5ced925
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-757%2Fnewren%2Frebase-mark-empty-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-757/newren/rebase-mark-empty-v2
Pull-Request: https://github.com/git/git/pull/757
Range-diff vs v1:
1: 0d94eea376a = 1: 0d94eea376a rebase -i: mark commits that begin empty in todo editor
-: ----------- > 2: e15c599c874 rebase: reinstate --no-keep-empty
-: ----------- > 3: ee5e42361fc rebase: fix an incompatible-options error message
--
gitgitgadget
