更新文件 git-en.md

Author: danc1ngSean

Git/git-en.md

@@ -10,7 +10,52 @@ After using `rebase`， the commits from `decelop` will be moved to the third `c
 
 ![](https://user-gold-cdn.xitu.io/2018/4/23/162f11cc2cb8b332?w=505&h=563&f=png&s=26514)
 
-Compare with `merge`, the result of `rebase` is very clear with a single flow. But if there is any conflict, you'll be in troule to solving them. You have to solve them one by one , while you only need to solve them once if using `merge`.
+Compare with `merge`, the result of `rebase` is very clear with a single flow. But if there is any conflict, you'll be in troule to solving them. You have to solve them one by one , while you only need to solve them one-time if using `merge`.
 
+You should use `rebase` on the local branchs which need be rebased. If you need to `rebase` the `develop` to the `master`, you should do as follows:
 
+```shell
+## branch develop
+git rebase master
+get checkout master
+## 用于将 `master` 上的 HEAD 移动到最新的 commit
+get merge develop
+```
 
+## stash
+
+Use `git stash` to save the current state of the working directory while you want to fix a temporary bug in development, if you don't want to use `commit`.
+
+```shell
+git stash
+```
+This command can record the current state of the working directory, if you want to recover it, you can do like this:
+
+```shell
+git stash pop
+```
+then you'll back to the exactly state before.
+
+## reflog
+
+This command will show you the records of HEAD's trace. If you delete a branch by mistake, you can examine the hashs of HEAD by using `reflog`.
+
+![](https://user-gold-cdn.xitu.io/2018/4/23/162f14df98ce3d83?w=950&h=118&f=png&s=77151)
+
+According to the picture, the last movement of HEAD is just after `merge`, and then the `new` branch was deleted, so we can get the branch back by the following command:
+
+```shell
+git checkout 37d9aca
+git checkout -b new
+```
+
+PS：`reflog` is time-bound, it can only record the state over a period of time.
+
+## Reset
+
+If you want to delete the last commit, you can do like this:
+
+```shell
+git reset --hard HEAD^
+```
+But this command doesn't delete the commit, it just reset the HEAD and the right branch the HEAD directing.