From 5a26b458b50d70f0cdc4035c5e95d84f9936df20 Mon Sep 17 00:00:00 2001 From: Jim Date: Mon, 17 Mar 2014 17:03:06 +0800 Subject: [PATCH] little blog content change --- _posts/2014/2014-03-17-Git_merge_--squash_and_git_rebase.md | 2 ++ 1 file changed, 2 insertions(+) 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 b7d15e8..0269164 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 @@ -41,6 +41,8 @@ Now `dev4` and `dev2` have the same content, but we cannot see `dev4` comes cont `--squash` will abandon the merge history, so you will not know what was merged. Only use it when you don't want these commit history! +------------------------ + ### Rebase ** Before rebase **