From 03e073d4f0d41fe2127c627473489ffcaa1dea21 Mon Sep 17 00:00:00 2001
From: Corentin Thomasset <corentin.thomasset74@gmail.com>
Date: Sun, 21 Jun 2020 18:42:19 +0200
Subject: [PATCH] feat: git memo

Signed-off-by: Corentin Thomasset <corentin.thomasset74@gmail.com>
---
 CHANGELOG.md                  |   1 +
 src/components/MemoViewer.vue |   2 +-
 src/routes/tools/GitMemo.vue  | 177 ++++++++++++++++++++--------------
 3 files changed, 105 insertions(+), 75 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b8fd2da..2c33421c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
diff --git a/src/components/MemoViewer.vue b/src/components/MemoViewer.vue
index a378f6fe..c8242a57 100644
--- a/src/components/MemoViewer.vue
+++ b/src/components/MemoViewer.vue
@@ -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;
 
     }
diff --git a/src/routes/tools/GitMemo.vue b/src/routes/tools/GitMemo.vue
index 78b205b1..53b78a79 100644
--- a/src/routes/tools/GitMemo.vue
+++ b/src/routes/tools/GitMemo.vue
@@ -17,56 +17,77 @@
     export default {
         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:[
-                       {
-                           text: 'Create a git repo',
-                           code: 'git init'
-                       },
-                       {
-                           text: 'Clone an existing repository',
-                           code: 'git clone [repo url]'
-                       },
-                       {
-                           text: 'Add current files to next commit',
-                           code: 'git add .'
-                       },
-                       {
-                           text: 'Commit tracked files changes',
-                           code: 'git commit -am "[commit message]"'
-                       },
-                       {
-                           text: 'List files that has changed',
-                           code: 'git status'
-                       },
-                       {
-                           text: 'List changes in tracked files',
-                           code: 'git diff'
-                       }
-                   ]
-               },
-               {
-                   section: 'Setup SSH',
-                   child:[
+            tips: [
+                {
+                    section: 'Get started',
+                    child: [
+                        {
+                            text: 'Create a git repo',
+                            code: 'git init'
+                        },
+                        {
+                            text: 'Clone an existing repository',
+                            code: 'git clone [repo url]'
+                        },
+                        {
+                            text: 'Add current files to next commit',
+                            code: 'git add .'
+                        },
+                        {
+                            text: 'Commit tracked files changes',
+                            code: 'git commit -am "[commit message]"'
+                        },
+                        {
+                            text: 'List files that has changed',
+                            code: 'git status'
+                        },
+                        {
+                            text: 'List changes in tracked files',
+                            code: 'git diff'
+                        }
+                    ]
+                },
+                {
+                    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: [
                         [
                             {
                                 text: '1). Generate an SSH key.',
@@ -90,30 +111,38 @@
                             },
 
                         ]
-                   ]
-               },
-               {
-                   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: 'Merge and rebase',
+                    child: [
+                        {
+                            text: 'Merge a branch into the current',
+                            code: 'git merge [branch]'
+                        },
+                        {
+                            text: 'Abort merge (conflicts)',
+                            code: 'git merge --abort'
+                        },
+                        {
+                            text: 'Continue merge after resolving conflicts',
+                            code: 'git merge --continue'
+                        },
+                        {
+                            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: {
             MemoViewer