Junio C Hamano add0951ab0 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

2010-01-20 20:28:49 -08:00

12 KiB

Raw Blame History

View Raw