diff options
author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-08-19 02:18:22 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-08-19 15:27:13 -0700 |
commit | a47ba3c77713d04953e0630f8e7109084329078a (patch) | |
tree | 0e175d60468de31cf99ebdf30c3f1329928aae03 /t/t5515/refs.br-config-explicit-merge | |
parent | rebase -i: always update HEAD before rewording (diff) | |
download | tgif-a47ba3c77713d04953e0630f8e7109084329078a.tar.xz |
rebase -i: check for updated todo after squash and reword
While a rebase is stopped for the user to edit a commit message it can
be convenient for them to also edit the todo list. The scripted version
of rebase supported this but the C version does not. We already check to
see if the todo list has been updated by an exec command so extend this
to rewords and squashes. It only costs a single stat call to do this so
it should not affect the speed of the rebase (especially as it has just
stopped for the user to edit a message)
Note that for squashes the editor may be opened on a different pick to
the squash itself as we edit the message at the end of a chain fixups
and squashes.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5515/refs.br-config-explicit-merge')
0 files changed, 0 insertions, 0 deletions