summaryrefslogtreecommitdiff
path: root/t/t4135
diff options
context:
space:
mode:
authorLibravatar Phillip Wood <phillip.wood@dunelm.org.uk>2021-08-20 15:40:35 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-08-20 12:54:36 -0700
commit2be6b6f411136c6773a90d2cfdacf3cccb79d3e6 (patch)
treea367481a78c0096b9cf51b5cb686659cbe70f088 /t/t4135
parentGit 2.33-rc2 (diff)
downloadtgif-2be6b6f411136c6773a90d2cfdacf3cccb79d3e6.tar.xz
rebase -r: make 'merge -c' behave like reword
If the user runs git log while rewording a commit it is confusing if sometimes we're amending the commit that's being reworded and at other times we're creating a new commit depending on whether we could fast-forward or not[1]. For this reason the reword command ensures that there are no uncommitted changes when rewording. The reword command also allows the user to edit the todo list while the rebase is paused. As 'merge -c' also rewords commits make it behave like reword and add a test. [1] https://lore.kernel.org/git/xmqqlfvu4be3.fsf@gitster-ct.c.googlers.com/T/#m133009cb91cf0917bcf667300f061178be56680a Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4135')
0 files changed, 0 insertions, 0 deletions