summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2012-01-13 17:39:15 +0100
committerJunio C Hamano <gitster@pobox.com>2012-01-13 09:50:17 -0800
commit6ab260809b61b622e833771fbe08874f14a7e544 (patch)
tree85225d150b7617f4f08a15962884d98721b3177f /git-merge-one-file.sh
parent04f6785a089e552585ba022f9d9054eca385ca67 (diff)
downloadgit-6ab260809b61b622e833771fbe08874f14a7e544.tar.gz
git-show-ref: fix escaping in asciidoc source
Two "^" characters were incorrectly being interpreted as markup for superscripting. Fix them by writing them as attribute references "{caret}". Although a single "^" character in a paragraph cannot be misinterpreted in this way, also write other "^" characters as "{caret}" in the interest of good hygiene (unless they are in literal paragraphs, of course, in which context attribute references are not recognized). Spell "{}" consistently, namely *not* quoted as "\{\}". Since the braces are empty, they cannot be interpreted as an attribute reference, and either spelling is OK. So arbitrarily choose one variation and use it consistently. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions