一套git教学。。。

Git

➜  kr-store git:(6ml-update-0331) ✗ git checkout 6ml-update-0330
error: Your local changes to the following files would be overwritten by checkout:
        src/index.tsx
Please commit your changes or stash them before you switch branches.
Aborting
➜  kr-store git:(6ml-update-0331) ✗
➜  kr-store git:(6ml-update-0331) ✗
➜  kr-store git:(6ml-update-0331) ✗
➜  kr-store git:(6ml-update-0331) ✗ glg
➜  kr-store git:(6ml-update-0331) ✗ gst
On branch 6ml-update-0331
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)
        modified:   src/index.tsx
no changes added to commit (use "git add" and/or "git commit -a")
➜  kr-store git:(6ml-update-0331) ✗ ga .
g%➜  kr-store git:(6ml-update-0331) ✗ gst
On branch 6ml-update-0331
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)
        modified:   src/index.tsx
➜  kr-store git:(6ml-update-0331) ✗ gcmsg 'stash'
[6ml-update-0331 d9d4158] stash
 1 file changed, 1 insertion(+), 1 deletion(-)
➜  kr-store git:(6ml-update-0331) gco
6ml-origin-version         6ml-update-0329-02         FETCH_HEAD                 master                     origin/6ml-update-0329     origin/HEAD
6ml-update-0324            6ml-update-0330            HEAD                       origin/6ml-origin-version  origin/6ml-update-0329-02  origin/master
6ml-update-0329            6ml-update-0331            ORIG_HEAD                  origin/6ml-update-0324     origin/6ml-update-0330
d9d4158  -- [HEAD]    stash (10 seconds ago)
90dd018  -- [HEAD^]   orders (33 minutes ago)
69bb71b  -- [HEAD^^]  order detail (13 hours ago)
66b7b78  -- [HEAD~3]  implement Image loader (15 hours ago)
efd4f1c  -- [HEAD~4]  address page (22 hours ago)
084758a  -- [HEAD~5]  Address page (27 hours ago)
ce84fc1  -- [HEAD~6]  user info (2 days ago)
62b4394  -- [HEAD~7]  orders page (2 days ago)
eb7eae3  -- [HEAD~8]  add project snippets (2 days ago)
d300ec5  -- [HEAD~9]  use font icon (2 days ago)
88dbf02  -- [HEAD~10] Merge branch 'master' of github.com:xreception/ecnova-store-mobile (2 days ago)
93c942a  -- [93c942a] Merge pull request #3 from xreception/6ml-update-0329-02 (2 days ago)
c33de42  -- [HEAD~11] merge master (2 days ago)
fc6a044  -- [fc6a044] update (2 days ago)
6e34422  -- [HEAD~12] cart item (2 days ago)
969a7e7  -- [969a7e7] update (2 days ago)
65b8e23  -- [65b8e23] little update (2 days ago)
e6c1a14  -- [e6c1a14] styles revise (2 days ago)
06dc654  -- [06dc654] Merge pull request #2 from xreception/6ml-update-0329 (2 days ago)
239391d  -- [239391d] delete TODO comments (2 days ago)
➜  kr-store git:(6ml-update-0331) gco 6ml-update-0330
Switched to branch '6ml-update-0330'
Your branch is up to date with 'origin/6ml-update-0330'.
➜  kr-store git:(6ml-update-0330)
➜  kr-store git:(6ml-update-0330)
➜  kr-store git:(6ml-update-0330) glog
➜  kr-store git:(6ml-update-0330) git reset 90dd018
Unstaged changes after reset:
M       package-lock.json
M       src/components/Button/button.css
M       src/components/Button/button.css.d.ts
M       src/components/Button/button.tsx
M       src/components/list/list.css
M       src/components/list/list.css.d.ts
M       src/components/list/list.tsx
M       src/index.tsx
➜  kr-store git:(6ml-update-0330) ✗ glog
➜  kr-store git:(6ml-update-0330) ✗ gst
On branch 6ml-update-0330
Your branch is behind 'origin/6ml-update-0330' by 8 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)
        modified:   package-lock.json
        modified:   src/components/Button/button.css
        modified:   src/components/Button/button.css.d.ts
        modified:   src/components/Button/button.tsx
        modified:   src/components/list/list.css
        modified:   src/components/list/list.css.d.ts
        modified:   src/components/list/list.tsx
        modified:   src/index.tsx
Untracked files:
  (use "git add <file>..." to include in what will be committed)
        src/screens/mobile-binding/
        src/screens/mobile-edit/
no changes added to commit (use "git add" and/or "git commit -a")
➜  kr-store git:(6ml-update-0330) ✗
➜  kr-store git:(6ml-update-0330) ✗
➜  kr-store git:(6ml-update-0330) ✗
➜  kr-store git:(6ml-update-0330) ✗ gst
On branch 6ml-update-0330
Your branch and 'origin/6ml-update-0330' have diverged,
and have 1 and 8 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)
        modified:   package-lock.json
        modified:   src/components/list/list.css
        modified:   src/components/list/list.css.d.ts
        modified:   src/components/list/list.tsx
        modified:   src/index.tsx
Untracked files:
  (use "git add <file>..." to include in what will be committed)
        src/screens/mobile-binding/
        src/screens/mobile-edit/
no changes added to commit (use "git add" and/or "git commit -a")
➜  kr-store git:(6ml-update-0330) ✗ ga .
➜  kr-store git:(6ml-update-0330) ✗ gst
On branch 6ml-update-0330
Your branch and 'origin/6ml-update-0330' have diverged,
and have 1 and 8 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)
        modified:   package-lock.json
        modified:   src/components/list/list.css
        modified:   src/components/list/list.css.d.ts
        modified:   src/components/list/list.tsx
        modified:   src/index.tsx
        new file:   src/screens/mobile-binding/defs.ts
        new file:   src/screens/mobile-binding/form.tsx
        new file:   src/screens/mobile-binding/index.ts
        new file:   src/screens/mobile-binding/mobile-binding.css
        new file:   src/screens/mobile-binding/mobile-binding.css.d.ts
        new file:   src/screens/mobile-binding/mobile-binding.tsx
        new file:   src/screens/mobile-edit/defs.ts
        new file:   src/screens/mobile-edit/form.tsx
        new file:   src/screens/mobile-edit/index.ts
        new file:   src/screens/mobile-edit/mobile-edit.css
        new file:   src/screens/mobile-edit/mobile-edit.css.d.ts
        new file:   src/screens/mobile-edit/mobile-edit.tsx
➜  kr-store git:(6ml-update-0330) ✗ gcmsg 'UserInfo page and mobile binding'
[6ml-update-0330 06f1490] UserInfo page and mobile binding
 17 files changed, 875 insertions(+), 543 deletions(-)
 create mode 100644 src/screens/mobile-binding/defs.ts
 create mode 100644 src/screens/mobile-binding/form.tsx
 create mode 100644 src/screens/mobile-binding/index.ts
 create mode 100644 src/screens/mobile-binding/mobile-binding.css
 create mode 100644 src/screens/mobile-binding/mobile-binding.css.d.ts
 create mode 100644 src/screens/mobile-binding/mobile-binding.tsx
 create mode 100644 src/screens/mobile-edit/defs.ts
 create mode 100644 src/screens/mobile-edit/form.tsx
 create mode 100644 src/screens/mobile-edit/index.ts
 create mode 100644 src/screens/mobile-edit/mobile-edit.css
 create mode 100644 src/screens/mobile-edit/mobile-edit.css.d.ts
 create mode 100644 src/screens/mobile-edit/mobile-edit.tsx
➜  kr-store git:(6ml-update-0330) git push origin 6ml-update-0330
^C
➜  kr-store git:(6ml-update-0330) git push -f origin 6ml-update-0330
Counting objects: 33, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (31/31), done.
Writing objects: 100% (33/33), 11.58 KiB | 697.00 KiB/s, done.
Total 33 (delta 17), reused 0 (delta 0)
remote: Resolving deltas: 100% (17/17), completed with 12 local objects.
To github.com:xreception/ecnova-store-mobile.git
 + 7c3f39f...06f1490 6ml-update-0330 -> 6ml-update-0330 (forced update)
➜  kr-store git:(6ml-update-0330)
➜  kr-store git:(6ml-update-0330)
➜  kr-store git:(6ml-update-0330)
➜  kr-store git:(6ml-update-0330) gco master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
➜  kr-store git:(master) gl
Already up to date.
➜  kr-store git:(master) git cherry-pick cb13620cfd83de5bbdd03dfb3fb52ef6dc58a04a
[master 1470ffc] add rect button style
 Date: Sat Mar 31 14:42:17 2018 +0800
 3 files changed, 20 insertions(+), 4 deletions(-)
➜  kr-store git:(master) glog
➜  kr-store git:(master)
➜  kr-store git:(master)
➜  kr-store git:(master)
➜  kr-store git:(master) gco 6ml-update-0331
Switched to branch '6ml-update-0331'
➜  kr-store git:(6ml-update-0331) glg
➜  kr-store git:(6ml-update-0331) git rebse master
git: 'rebse' is not a git command. See 'git --help'.
The most similar command is
        rebase
➜  kr-store git:(6ml-update-0331) git rebase master
First, rewinding head to replay your work on top of it...
Applying: stash
➜  kr-store git:(6ml-update-0331) glg
➜  kr-store git:(6ml-update-0331) glog
➜  kr-store git:(6ml-update-0331) git reset HEAD^1
Unstaged changes after reset:
M       src/index.tsx
➜  kr-store git:(6ml-update-0331) ✗ glog
➜  kr-store git:(6ml-update-0331) ✗ gst
On branch 6ml-update-0331
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)
        modified:   src/index.tsx
no changes added to commit (use "git add" and/or "git commit -a")
➜  kr-store git:(6ml-update-0331) ✗