diff options
| author |  Elijah Newren <newren@gmail.com> | 2020-02-15 21:36:36 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-02-16 15:40:42 -0800 |
| commit | c2417d3af7574adc1fb14f7df31b862aa9551e2e (patch) | |
| tree | cd1a3836ef6cf2564cce12fa76e959e7691cff9d /builtin/rebase.c | |
| parent | git-prompt: change the prompt for interactive-based rebases (diff) | |
| download | tgif-c2417d3af7574adc1fb14f7df31b862aa9551e2e.tar.xz | |
rebase: drop '-i' from the reflog for interactive-based rebases
A large variety of rebase types are supported by the interactive
machinery, not just the explicitly interactive ones. These all share
the same code and write the same reflog messages, but the "-i" moniker
in those messages doesn't really have much meaning. It also becomes
somewhat distracting once we switch the default from the am-backend to
the interactive one. Just remove the "-i" from these messages.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rebase.c')
| -rw-r--r-- | builtin/rebase.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 77abe674cb..ffaa793524 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1441,7 +1441,7 @@ static void set_reflog_action(struct rebase_options *options) if (env && strcmp("rebase", env)) return; /* only override it if it is "rebase" */ - strbuf_addf(&buf, "rebase -i (%s)", options->action); + strbuf_addf(&buf, "rebase (%s)", options->action); setenv(GIT_REFLOG_ACTION_ENVIRONMENT, buf.buf, 1); strbuf_release(&buf); } |