From 8506fc52841b39fade662b2958bfad6b7f857439 Mon Sep 17 00:00:00 2001
From: Jim <dashjim@gmail.com>
Date: Wed, 5 Feb 2014 10:20:37 +0800
Subject: [PATCH] modify the footer of post to add more info about JIM

---
 _layouts/post-en.html                   | 3 ++-
 _layouts/post.html                      | 3 ++-
 _posts/2014/2014-02-03-Git-cook-book.md | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

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 }}
 </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">
   /
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 }}
 </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">
   /
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 <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'