klinsmaya/dashjim.github.com
1
0
Fork 0
mirror of https://gh-proxy.org/https://github.com/klinsmaya/dashjim.github.com.git synced 2026-11-08 01:16:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

little blog content change

Browse Source
This commit is contained in:
Jim
2014-03-17 17:09:07 +08:00
parent a28ae772e9
commit a4e4e588aa
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_posts/2014/2014-03-17-Git_merge_--squash_and_git_rebase.md
+1 -1
View File
@@ -7,7 +7,7 @@ tags:
- Git
---
> One advantage for Git comes from its powerful branch management capability, but it will be hard to maintain the commit history between different branches. As Linus said that [Clear and Clean is important for the commit history](http://blog.sevenche.com/2014/02/Linus-Torvalds-rules-for-using-Git/). Here in this article I am going to demonstrate how `git merge --squash`, `git merge`, and `git rebase` will affect the commit history.
> One advantage for Git comes from its powerful branch management capability, but it will be hard to maintain the commit history between different branches. As Linus said that [Clear and Clean is important for the commit history](http://blog.sevenche.com/2014/02/Linus-Torvalds-rules-for-using-Git/), here in this article I am going to demonstrate how `git merge --squash`, `git merge`, and `git rebase` will affect the commit history.
### `git merge` and `git merge --squash`