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

feat: git memo

Browse source 
Signed-off-by: Corentin Thomasset <corentin.thomasset74@gmail.com>
This commit is contained in:
Corentin Thomasset 2020-06-21 18:42:19 +02:00
parent cb0e3f91db
commit 03e073d4f0
No known key found for this signature in database
GPG key ID: DBD997E935996158
3 changed files with 105 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -5,6 +5,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Next
- [ui] condensed + colored sidenav
- [feat] added [git memo](/#/git-memo)
## 1.3.0
- [fix] [GithubContributors] ordered contributors by contribution count

2
src/components/MemoViewer.vue
View file

@ -38,7 +38,7 @@
<style lang="less" scoped>
.memo-viewer {
column-gap: 30px;
column-rule: 1px solid #373739;
column-rule: 1px solid #37373961;
column-fill: auto;
}

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

@ -18,23 +18,6 @@
name: "GitMemo",
data: () => ({
tips: [
{
section: 'Basic configuration',
child:[
{
text: 'Set the name that will be associated to every operation',
code: 'git config --global user.name "[nom]"'
},
{
text: 'Set the email address that will be associated to every operation',
code: 'git config --global user.email "[email]"'
},
{
text: 'Tell git to always push tags',
code: 'git config --global push.followTags true'
}
]
},
{
section: 'Get started',
child: [
@ -64,6 +47,44 @@
}
]
},
{
section: 'Basic configuration',
child: [
{
text: 'Set the name that will be associated to every operation',
code: 'git config --global user.name "[nom]"'
},
{
text: 'Set the email address that will be associated to every operation',
code: 'git config --global user.email "[email]"'
},
{
text: 'Tell git to always push tags',
code: 'git config --global push.followTags true'
}
]
},
{
section: 'I\'ve made a mistake',
child: [
{
text: 'Change last commit message',
code: 'git commit --amend'
},
{
text: 'Undo most recent commit and keep changes',
code: 'git reset HEAD~1'
},
{
text: 'Undo most recent commit and get rid of changes',
code: 'git reset HEAD~1 --hard'
},
{
text: 'Reset branch to remote state',
code: 'git fetch origin\ngit reset --hard origin/[branch-name]'
}
]
},
{
section: 'Setup SSH',
child: [
@ -93,26 +114,34 @@
]
},
{
section: 'I\'ve made a mistake',
section: 'Merge and rebase',
child: [
{
text: 'Change last commit message',
code: 'git commit --amend'
text: 'Merge a branch into the current',
code: 'git merge [branch]'
},
{
text: 'Undo most recent commit and keep changes',
code: 'git reset HEAD~1'
text: 'Abort merge (conflicts)',
code: 'git merge --abort'
},
{
text: 'Undo most recent commit and get rid of changes',
code: 'git reset HEAD~1 --hard'
text: 'Continue merge after resolving conflicts',
code: 'git merge --continue'
},
{
text: 'Reset branch to remote state',
code: 'git fetch origin\ngit reset --hard origin/[branch-name]'
}
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'
},
]
}
},
]
}),
components: {