Skip to content

Commit

Permalink
图片更新
Browse files Browse the repository at this point in the history
  • Loading branch information
heartacker committed Jun 30, 2021
1 parent 1b814a5 commit 2631ff5
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion 04.Git/1.git-GUI/07.merge和rebase以及cherry-pick.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,6 @@ rebase 也能合并分支,它会取出`master` 中一系列 commit 记录,

![cherry-pick](image/git-cherry-pick-graph-2.gif)

## 总结
## 1.5. 总结
不同的场景,有不同的处理方式。
主要使用的还是 `merge``rebase`
4 changes: 3 additions & 1 deletion 04.Git/1.git-GUI/08.远程分支管理.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ push --> Serv
```

![git-sync](image/remote-man-flow.png)
![原理](image/remote-man-flow.png)

![原理命令](image/git-command2.jpg)

## 1.2. 操作方式

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added 04.Git/1.git-GUI/image/git-command2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified 04.Git/1.git-GUI/image/remote-man-flow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 2631ff5

Please sign in to comment.