summaryrefslogtreecommitdiff
path: root/t/t1505-rev-parse-last.sh
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2020-04-11 02:44:26 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-04-11 14:15:54 -0700
commit50ed76148a96d6cf37549c0492e6da1ff85b9bd0 (patch)
tree7033538a0a7f305f0fc7d70c4ccf48b3ca9b8926 /t/t1505-rev-parse-last.sh
parentrebase: reinstate --no-keep-empty (diff)
downloadtgif-50ed76148a96d6cf37549c0492e6da1ff85b9bd0.tar.xz
rebase: fix an incompatible-options error message
When the user specifies the apply backend with options that only work with the merge backend, such as git rebase --apply --exec /bin/true HEAD~3 the error message has always been fatal: --exec requires an interactive rebase This error message is misleading and was one of the reasons we renamed the interactive backend to the merge backend. Update the error message to state that these options merely require use of the merge backend. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1505-rev-parse-last.sh')
0 files changed, 0 insertions, 0 deletions