fix: GitMemo displayed commands

2022-03-02 14:36:50 +01:00 · 2022-03-02 14:36:50 +01:00 · b65b69dd97
commit b65b69dd97
parent 5bd5d2c2f3
1 changed files with 1 additions and 5 deletions
--- 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'
                        },
                    ]
                },