diff --git a/src/routes/tools/GitMemo.vue b/src/routes/tools/GitMemo.vue index 53b78a79..1ccc1b97 100644 --- a/src/routes/tools/GitMemo.vue +++ b/src/routes/tools/GitMemo.vue @@ -132,13 +132,9 @@ text: 'Rebase a branch into the current', code: 'git rebase [branch]' }, - { - text: 'Rebase merge (conflicts)', - code: 'git merge --abort' - }, { text: 'Continue rebase after resolving conflicts', - code: 'git merge --continue' + code: 'git rebase --continue' }, ] },