Sync with Git 1.8.4.1
authorJonathan Nieder <jrnieder@gmail.com>
Thu, 26 Sep 2013 22:36:57 +0000 (15:36 -0700)
committerJonathan Nieder <jrnieder@gmail.com>
Thu, 26 Sep 2013 22:36:57 +0000 (15:36 -0700)
1  2 
Documentation/git.txt
Simple merge