diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-02-07 09:05:20 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-02-07 09:05:20 +0300 |
commit | 8fe9c3f21dff206acb464d86cbd3bf4dbbb94f38 (patch) | |
tree | f33b9ec70cc3d7e7a068d7ef24a6895d69accf00 /sequencer.h | |
parent | 8feddda32cc50e928404788d7b9377c0b5f73f50 (diff) | |
parent | 68aa495b590d417e88562ab1e5da7d84d0531f21 (diff) |
Merge branch 'en/rebase-merge-on-sequencer'
"git rebase --merge" as been reimplemented by reusing the internal
machinery used for "git rebase -i".
* en/rebase-merge-on-sequencer:
rebase: implement --merge via the interactive machinery
rebase: define linearization ordering and enforce it
git-legacy-rebase: simplify unnecessary triply-nested if
git-rebase, sequencer: extend --quiet option for the interactive machinery
am, rebase--merge: do not overlook --skip'ed commits with post-rewrite
t5407: add a test demonstrating how interactive handles --skip differently
rebase: fix incompatible options error message
rebase: make builtin and legacy script error messages the same
Diffstat (limited to 'sequencer.h')
-rw-r--r-- | sequencer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sequencer.h b/sequencer.h index 5d7bc04751..53b8679718 100644 --- a/sequencer.h +++ b/sequencer.h @@ -40,6 +40,7 @@ struct replay_opts { int allow_empty_message; int keep_redundant_commits; int verbose; + int quiet; int reschedule_failed_exec; int mainline; |