diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-04-22 23:43:00 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-22 23:43:00 +0300 |
| commit | c7d8f69da5443788950b823bd6b9b663e1e686a3 (patch) | |
| tree | 3be858fe8fbafd1871eb49ff3de45c90568d82f0 /sequencer.h | |
| parent | 8b39dfdf47ee2d7a2afd1ff9932c09ad5b00076b (diff) | |
| parent | 50ed76148a96d6cf37549c0492e6da1ff85b9bd0 (diff) | |
Merge branch 'en/rebase-no-keep-empty'
"git rebase" (again) learns to honor "--no-keep-empty", which lets
the user to discard commits that are empty from the beginning (as
opposed to the ones that become empty because of rebasing). The
interactive rebase also marks commits that are empty in the todo.
* en/rebase-no-keep-empty:
rebase: fix an incompatible-options error message
rebase: reinstate --no-keep-empty
rebase -i: mark commits that begin empty in todo editor
Diffstat (limited to 'sequencer.h')
| -rw-r--r-- | sequencer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.h b/sequencer.h index 0bee85093e..04c5c31904 100644 --- a/sequencer.h +++ b/sequencer.h @@ -134,7 +134,7 @@ int sequencer_rollback(struct repository *repo, struct replay_opts *opts); int sequencer_skip(struct repository *repo, struct replay_opts *opts); int sequencer_remove_state(struct replay_opts *opts); -/* #define TODO_LIST_KEEP_EMPTY (1U << 0) */ /* No longer used */ +#define TODO_LIST_KEEP_EMPTY (1U << 0) #define TODO_LIST_SHORTEN_IDS (1U << 1) #define TODO_LIST_ABBREVIATE_CMDS (1U << 2) #define TODO_LIST_REBASE_MERGES (1U << 3) |