Skip to content

Commit ebd4d96

Browse files
author
YuChengKai
committed
2 parents cccef2a + 89a101c commit ebd4d96

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Git/git-en.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ We usually use `merge` to merge the code from one branch to `master` , like this
1717

1818
![](https://user-gold-cdn.xitu.io/2018/4/23/162f109db27be054?w=505&h=461&f=png&s=22796)
1919

20-
After using `rebase ` , the commits from `decelop` will be moved to the third `commit` of the `master` in order, as follows:
20+
After using `rebase ` , the commits from `develop` will be moved to the third `commit` of the `master` in order, as follows:
2121

2222
![](https://user-gold-cdn.xitu.io/2018/4/23/162f11cc2cb8b332?w=505&h=563&f=png&s=26514)
2323

@@ -28,9 +28,9 @@ You should use `rebase` on the local branchs which need be rebased. If you need
2828
```shell
2929
## branch develop
3030
git rebase master
31-
get checkout master
31+
git checkout master
3232
## move HEAD on `master` to the latest commit
33-
get merge develop
33+
git merge develop
3434
```
3535

3636
## stash

Git/git-zh.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ Rebase 对比 merge,优势在于合并后的结果很清晰,只有一条线
3030
```shell
3131
## branch develop
3232
git rebase master
33-
get checkout master
33+
git checkout master
3434
## 用于将 `master` 上的 HEAD 移动到最新的 commit
35-
get merge develop
35+
git merge develop
3636
```
3737

3838
## stash

0 commit comments

Comments
 (0)