![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 21 Jan 2010 04:28:49 +0000 (20:28 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 21 Jan 2010 04:28:49 +0000 (20:28 -0800) | ||
| commit | add0951ab0bee43b5f634d1be68a7a80f627c18f | |
| tree | 084fe451a6b0c7d68d8d16c4ea9f64c38d9e01b0 | tree | snapshot |
| parent | 5fc9df08b564aa9d11265ad591f9ef104695ce2b | commit | diff |
| parent | 0b444cdb19bcfcc7f59b7b00783cbfbbc5ddcf63 | commit | diff |
Merge remote branch 'remotes/trast-doc/for-next'
* 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
* 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
18 files changed: