Merge remote branch 'remotes/trast-doc/for-next'
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Jan 2010 04:28:49 +0000 (20:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Jan 2010 04:28:49 +0000 (20:28 -0800)
* remotes/trast-doc/for-next:
Documentation: spell 'git cmd' without dash throughout
Documentation: format full commands in typewriter font
Documentation: warn prominently against merging with dirty trees
Documentation/git-merge: reword references to "remote" and "pull"

Conflicts:
Documentation/config.txt
Documentation/git-config.txt
Documentation/git-merge.txt

No differences found