Code

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)
commitadd0951ab0bee43b5f634d1be68a7a80f627c18f
tree084fe451a6b0c7d68d8d16c4ea9f64c38d9e01b0
parent5fc9df08b564aa9d11265ad591f9ef104695ce2b
parent0b444cdb19bcfcc7f59b7b00783cbfbbc5ddcf63
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
18 files changed:
Documentation/config.txt
Documentation/git-blame.txt
Documentation/git-commit.txt
Documentation/git-config.txt
Documentation/git-cvsserver.txt
Documentation/git-difftool.txt
Documentation/git-fast-import.txt
Documentation/git-http-backend.txt
Documentation/git-ls-files.txt
Documentation/git-merge.txt
Documentation/git-push.txt
Documentation/git-read-tree.txt
Documentation/git-rebase.txt
Documentation/git-reset.txt
Documentation/git-rev-parse.txt
Documentation/git-update-index.txt
Documentation/git.txt
Documentation/gitcore-tutorial.txt