From a4e4e588aa1ef1543b7f1aa5c24539c5e961bee2 Mon Sep 17 00:00:00 2001 From: Jim Date: Mon, 17 Mar 2014 17:09:07 +0800 Subject: [PATCH] little blog content change --- _posts/2014/2014-03-17-Git_merge_--squash_and_git_rebase.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2014/2014-03-17-Git_merge_--squash_and_git_rebase.md b/_posts/2014/2014-03-17-Git_merge_--squash_and_git_rebase.md index dc00f73..f333ec5 100644 --- a/_posts/2014/2014-03-17-Git_merge_--squash_and_git_rebase.md +++ b/_posts/2014/2014-03-17-Git_merge_--squash_and_git_rebase.md @@ -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`