From 18cf1e4f1f42d7e9d61200e5ddbde2d0ef26ecb2 Mon Sep 17 00:00:00 2001 From: Jim Date: Wed, 23 Apr 2014 13:25:20 +0800 Subject: [PATCH] edit Linus blog --- _posts/2014/2014-02-28-Linus-Torvalds-rules-for-using-Git.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_posts/2014/2014-02-28-Linus-Torvalds-rules-for-using-Git.md b/_posts/2014/2014-02-28-Linus-Torvalds-rules-for-using-Git.md index 2e9fc35..4f8b5e5 100644 --- a/_posts/2014/2014-02-28-Linus-Torvalds-rules-for-using-Git.md +++ b/_posts/2014/2014-02-28-Linus-Torvalds-rules-for-using-Git.md @@ -45,7 +45,7 @@ So merging too much results in a very messy history, where you can't see what th There's a few rants and rules about this that I did on the mailing lists last merge window. See for example [rant](http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html) ###另一个Mail List里的意见 -我也给复制过来了，这样更完整一点。 +上面写的有些概括，这里其实是对上文的解释。 ###邮件上下文 > My plans from now on are just to send you non-linear trees, whenever I @@ -57,6 +57,7 @@ There's a few rants and rules about this that I did on the mailing lists last me ###Linus回答 > 注意Linus的原文就是用Markdown格式写的，下面是原文，我没有加入任何Markdown格式。说明Linus在写邮件的时候是极为注意细节的。大家可以去查看[原文的Raw格式](http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html) +> 另外如果下文提到的rebase你不是特别清楚的话，请参考[git merge --squash and git rebase explained](http://http://blog.sevenche.com/2014/03/Git_merge_--squash_and_git_rebase/) I want clean history, but that really means (a) clean and (b) history.