summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Jason St. John <jstjohn@purdue.edu>2013-11-14 18:08:45 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-11-18 13:30:51 -0800
commitca03c3682a45c9c10273cbdfaa48edea084ffd11 (patch)
tree5c2832d915a4692f0ed2abde7e38fef32b2d92bb /Documentation/merge-strategies.txt
parentGit 1.8.4.3 (diff)
downloadtgif-ca03c3682a45c9c10273cbdfaa48edea084ffd11.tar.xz
State correct usage of literal examples in man pages in the coding standards
The man pages contain inconsistent usage of backticks vs. single quotes around options, commands, etc. that are in paragraphs. This commit states that backticks should always be used around literal examples. This commit states that "--" and friends should not be escaped (e.g. use `--pretty=oneline` instead of `\--pretty=oneline`). This commit also states correct usage for typesetting command usage examples with inline substitutions. Thanks-to: Ramkumar Ramachandra <artagnon@gmail.com> Thanks-to: Stuart Rackham <srackham@gmail.com> Thanks-to: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jason St. John <jstjohn@purdue.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions