| commit | 95dd4b2b14db912b482320c0a69518e77e7af19a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 1 Jun 2018 06:06:40 +0000 (1 15:06 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 1 Jun 2018 06:06:40 +0000 (1 15:06 +0900) | ||
| tree | 2669be208ec8d5660fa69ebda9006e16a0abd3d7 | treesnapshot (tar.gz zip) |
| parent | cbb408e6aef5b0d06facc16bb7a8615925894ad4 | commitdiff |
| parent | 5971b0836eece0ffcafe15fd5d67934787ea1777 | commitdiff |
Merge branch 'js/rebase-recreate-merge'
Hotfixes.
* js/rebase-recreate-merge:
sequencer: ensure labels that are object IDs are rewritten
git-rebase--interactive: fix copy-paste mistake
Hotfixes.
* js/rebase-recreate-merge:
sequencer: ensure labels that are object IDs are rewritten
git-rebase--interactive: fix copy-paste mistake
| git-rebase--interactive.sh | diff1 | diff2 | blobhistory |
| sequencer.c | diff1 | diff2 | blobhistory |
| t/t3430-rebase-merges.sh | diff1 | diff2 | blobhistory |