modify the footer of post to add more info about JIM

This commit is contained in:
Jim
2014-02-05 10:20:37 +08:00
parent fd834135b2
commit 8506fc5284
3 changed files with 5 additions and 3 deletions
+2 -1
View File
@@ -6,8 +6,9 @@ layout: default
{{ content }}
</section>
<section class="meta">
<hr/>
<span class="author">
<a href="http://blog.sevenche.com">{{ site.author }}</a>
<a href="http://blog.sevenche.com">{{ site.author }}</a> - 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.
</span>
<span class="time">
/
+2 -1
View File
@@ -6,8 +6,9 @@ layout: default
{{ content }}
</section>
<section class="meta">
<hr/>
<span class="author">
<a href="http://blog.sevenche.com">{{ site.author }}</a>
<a href="http://blog.sevenche.com">{{ site.author }}</a> - 程序员,7年工作经验集中在Java, Android, C++,现就职于Avaya Emerging Product and Technology部门。
</span>
<span class="time">
/
+1 -1
View File
@@ -54,7 +54,7 @@ git log --follow <filename> (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'