diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-10-11 14:24:46 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-11 14:24:47 +0900 |
| commit | 4608a029b490a87469680ee7d055a6d7cb5912c6 (patch) | |
| tree | 6bc53915b66001d83e2fa1c6c7aa738545d713df /t/t7505 | |
| parent | Merge branch 'tk/git-svn-trim-author-name' (diff) | |
| parent | sequencer: simplify root commit creation (diff) | |
| download | tgif-4608a029b490a87469680ee7d055a6d7cb5912c6.tar.xz | |
Merge branch 'pw/rebase-i-show-HEAD-to-reword'
"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
Diffstat (limited to 't/t7505')
| -rw-r--r-- | t/t7505/expected-rebase-i | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t7505/expected-rebase-i b/t/t7505/expected-rebase-i index c514bdbb94..93bada596e 100644 --- a/t/t7505/expected-rebase-i +++ b/t/t7505/expected-rebase-i @@ -7,7 +7,8 @@ message (no editor) [edit rebase-10] message [fixup rebase-9] message (no editor) [fixup rebase-8] message (no editor) [squash rebase-7] -message [reword rebase-6] +HEAD [reword rebase-6] +message (no editor) [reword rebase-6] message [squash rebase-5] message (no editor) [fixup rebase-4] message (no editor) [pick rebase-3] |