diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-21 04:28:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-21 04:28:49 (GMT) |
| commit | add0951ab0bee43b5f634d1be68a7a80f627c18f (patch) | |
| tree | 084fe451a6b0c7d68d8d16c4ea9f64c38d9e01b0 /builtin-rm.c | |
| parent | 5fc9df08b564aa9d11265ad591f9ef104695ce2b (diff) | |
| parent | 0b444cdb19bcfcc7f59b7b00783cbfbbc5ddcf63 (diff) | |
| download | git-add0951ab0bee43b5f634d1be68a7a80f627c18f.zip git-add0951ab0bee43b5f634d1be68a7a80f627c18f.tar.gz git-add0951ab0bee43b5f634d1be68a7a80f627c18f.tar.bz2 | |
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 'builtin-rm.c')
0 files changed, 0 insertions, 0 deletions