]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dc3fd24 170eea9)
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
tree268c9b0c2e956fb4b7095d45f9b49f0a5e154ba5tree | snapshot
parentdc3fd2486f4576a61570917c2ea6e165d380382dcommit | diff
parent170eea9750e1bca7a35b5d27def9ee77df92fdf1commit | diff
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 diff1 | diff2 | blob | history
t/t3430-rebase-merges.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.