diff options
author | Elijah Newren <newren@gmail.com> | 2020-02-15 21:36:35 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-02-16 15:40:42 -0800 |
commit | 6d04ce75c4dd4bf0aeda7383c4d791daa049c98a (patch) | |
tree | 88dc1d70073afcb6e42e86388fa7d9679302e606 /.gitmodules | |
parent | rebase: add an --am option (diff) | |
download | tgif-6d04ce75c4dd4bf0aeda7383c4d791daa049c98a.tar.xz |
git-prompt: change the prompt for interactive-based rebases
In the past, we had different prompts for different types of rebases:
REBASE: for am-based rebases
REBASE-m: for merge-based rebases
REBASE-i: for interactive-based rebases
It's not clear why this distinction was necessary or helpful; when the
prompt was added in commit e75201963f67 ("Improve bash prompt to detect
various states like an unfinished merge", 2007-09-30), it simply added
these three different types. Perhaps there was a useful purpose back
then, but there have been some changes:
* The merge backend was deleted after being implemented on top of the
interactive backend, causing the prompt for merge-based rebases to
change from REBASE-m to REBASE-i.
* The interactive backend is used for multiple different types of
non-interactive rebases, so the "-i" part of the prompt doesn't
really mean what it used to.
* Rebase backends have gained more abilities and have a great deal of
overlap, sometimes making it hard to distinguish them.
* Behavioral differences between the backends have also been ironed
out.
* We want to change the default backend from am to interactive, which
means people would get "REBASE-i" by default if we didn't change
the prompt, and only if they specified --am or --whitespace or -C
would they get the "REBASE" prompt.
* In the future, we plan to have "--whitespace", "-C", and even "--am"
run the interactive backend once it can handle everything the
am-backend can.
For all these reasons, make the prompt for any type of rebase just be
"REBASE".
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions