mirrors/it-tools
1
0
Fork 0
mirror of https://github.com/CorentinTh/it-tools.git synced 2025-04-20 14:56:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: GitMemo displayed commands

Browse source
This commit is contained in:
Dante-DaCapo 2022-03-02 14:36:50 +01:00
parent 5bd5d2c2f3
commit b65b69dd97
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/routes/tools/GitMemo.vue
View file

@ -132,13 +132,9 @@
text: 'Rebase a branch into the current', text: 'Rebase a branch into the current',
code: 'git rebase [branch]' code: 'git rebase [branch]'
}, },
{
text: 'Rebase merge (conflicts)',
code: 'git merge --abort'
},
{ {
text: 'Continue rebase after resolving conflicts', text: 'Continue rebase after resolving conflicts',
code: 'git merge --continue' code: 'git rebase --continue'
}, },
] ]
}, },