]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'pw/rebase-i-orig-head'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Nov 2020 21:32:53 +0000 (13:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Nov 2020 21:32:53 +0000 (13:32 -0800)
"git rebase -i" did not store ORIG_HEAD correctly.

* pw/rebase-i-orig-head:
  rebase -i: simplify get_revision_ranges()
  rebase -i: use struct object_id when writing state
  rebase -i: use struct object_id rather than looking up commit
  rebase -i: stop overwriting ORIG_HEAD buffer

1  2 
builtin/rebase.c
sequencer.c
sequencer.h

Simple merge
diff --cc sequencer.c
Simple merge
diff --cc sequencer.h
Simple merge