]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ak/sequencer-fix-find-uniq-abbrev'
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Aug 2020 23:14:48 +0000 (16:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Aug 2020 23:14:48 +0000 (16:14 -0700)
Ring buffer with size 4 used for bin-hex translation resulted in a
wrong object name in the sequencer's todo output, which has been
corrected.

* ak/sequencer-fix-find-uniq-abbrev:
  rebase -i: fix possibly wrong onto hash in todo

1  2 
sequencer.c
t/t3404-rebase-interactive.sh

diff --cc sequencer.c
Simple merge
Simple merge