diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-21 05:28:49 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-21 05:28:49 +0100 |
| commit | add0951ab0bee43b5f634d1be68a7a80f627c18f (patch) | |
| tree | 084fe451a6b0c7d68d8d16c4ea9f64c38d9e01b0 /t/t2007-checkout-symlink.sh | |
| parent | Merge branch 'jh/notes' (early part) (diff) | |
| parent | Documentation: spell 'git cmd' without dash throughout (diff) | |
| download | git-add0951ab0bee43b5f634d1be68a7a80f627c18f.tar.xz git-add0951ab0bee43b5f634d1be68a7a80f627c18f.zip | |
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
Diffstat (limited to 't/t2007-checkout-symlink.sh')
0 files changed, 0 insertions, 0 deletions