Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Git/git-en.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ You should use `rebase` on the local branchs which need be rebased. If you need
```shell
## branch develop
git rebase master
get checkout master
git checkout master
## move HEAD on `master` to the latest commit
get merge develop
git merge develop
```

## stash
Expand Down
4 changes: 2 additions & 2 deletions Git/git-zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ Rebase 对比 merge,优势在于合并后的结果很清晰,只有一条线
```shell
## branch develop
git rebase master
get checkout master
git checkout master
## 用于将 `master` 上的 HEAD 移动到最新的 commit
get merge develop
git merge develop
```

## stash
Expand Down