diff --git a/_layouts/post-en.html b/_layouts/post-en.html index f0fe102..006f645 100644 --- a/_layouts/post-en.html +++ b/_layouts/post-en.html @@ -6,8 +6,9 @@ layout: default {{ content }}
+
- {{ site.author }} + {{ site.author }} - Software Engineer with more than 7 years experience related to Java, Android and C++. He is now working for Avaya Emerging Product and Technology Department. / diff --git a/_layouts/post.html b/_layouts/post.html index 8b96c0a..dcdbf14 100755 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -6,8 +6,9 @@ layout: default {{ content }}
+
- {{ site.author }} + {{ site.author }} - 程序员,7年工作经验集中在Java, Android, C++,现就职于Avaya Emerging Product and Technology部门。 / diff --git a/_posts/2014/2014-02-03-Git-cook-book.md b/_posts/2014/2014-02-03-Git-cook-book.md index 708f9e1..1b5d635 100644 --- a/_posts/2014/2014-02-03-Git-cook-book.md +++ b/_posts/2014/2014-02-03-Git-cook-book.md @@ -54,7 +54,7 @@ git log --follow (Show rename) ``` ### How to only produce one commit for a merge? ----------- -Think about you have a dev branch and a main branch and you have a lot of commits in your dev branch, but when merge code you don't want all those comments go to the main branch(the main branch history could be more meaningful). use `--squash` to only produce one new commit for the merge. +Think about you have a dev branch and a main branch and you have a lot of commits in your dev branch, but when merge code you don't want all those comment history goes to the main branch(the main branch history could be more meaningful). use `--squash` to only produce one new commit for the merge. ``` git merge --squash bugfix git commit -m 'fix bug'