git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 020011f b0a3186)
Merge branch 'pw/rebase-i-show-HEAD-to-reword'
authorJunio C Hamano <redacted>
Fri, 11 Oct 2019 05:24:46 +0000 (14:24 +0900)
committerJunio C Hamano <redacted>
Fri, 11 Oct 2019 05:24:47 +0000 (14:24 +0900)
"git rebase -i" showed a wrong HEAD while "reword" open the editor.

* pw/rebase-i-show-HEAD-to-reword:
  sequencer: simplify root commit creation
  rebase -i: check for updated todo after squash and reword
  rebase -i: always update HEAD before rewording

1  2 
sequencer.c patch | diff1 | diff2 | blob | history
t/t3404-rebase-interactive.sh patch | diff1 | diff2 | blob | history

diff --cc sequencer.c
Simple merge
diff --cc t/t3404-rebase-interactive.sh
Simple merge
git clone https://git.99rst.org/PROJECT