diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-02-14 14:28:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-14 14:28:20 -0800 |
| commit | 6f07c7b91197aa06c5d8a05c67100c369012f933 (patch) | |
| tree | 7b829c0542e0862da56ec058fb9b33c88c17e5be /ws.c | |
| parent | Git 2.21-rc1 (diff) | |
| parent | git-rebase.txt: update to reflect merge now implemented on sequencer (diff) | |
| download | tgif-6f07c7b91197aa06c5d8a05c67100c369012f933.tar.xz | |
Merge branch 'en/rebase-merge-on-sequencer'
"git rebase --merge" as been reimplemented by reusing the internal
machinery used for "git rebase -i".
* en/rebase-merge-on-sequencer:
git-rebase.txt: update to reflect merge now implemented on sequencer
Diffstat (limited to 'ws.c')
0 files changed, 0 insertions, 0 deletions