From b65b69dd979b6fa9e85c59b100a10ec9e7a80b8e Mon Sep 17 00:00:00 2001 From: Dante-DaCapo Date: Wed, 2 Mar 2022 14:36:50 +0100 Subject: [PATCH] fix: GitMemo displayed commands --- src/routes/tools/GitMemo.vue | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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' }, ] },