]> git.ipfire.org Git - thirdparty/git.git/commit - t/t9003-help-autocorrect.sh
Merge branch 'js/rebase-count-fixes'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 May 2023 20:35:56 +0000 (05:35 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 May 2023 20:35:57 +0000 (05:35 +0900)
commitcacc15ee3fa1a00b1a01ca2caf050cf2f6e0cc8f
tree268c9b0c2e956fb4b7095d45f9b49f0a5e154ba5
parentdc3fd2486f4576a61570917c2ea6e165d380382d
parent170eea9750e1bca7a35b5d27def9ee77df92fdf1
Merge branch 'js/rebase-count-fixes'

A few bugs in the sequencer machinery that results in miscounting
the steps have been corrected.

* js/rebase-count-fixes:
  rebase -r: fix the total number shown in the progress
  rebase --update-refs: fix loops
sequencer.c
t/t3430-rebase-merges.sh