diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-05-22 12:41:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-22 12:41:50 -0700 |
| commit | d1caa5895458443cc9535b6fda6ff8480383471b (patch) | |
| tree | c9e449b8416bc1a10887c36b2b4b9262cca12af1 /Documentation/git-merge.txt | |
| parent | Merge branch 'jk/stripspace-asciidoctor-fix' (diff) | |
| parent | doc: convert AsciiDoc {?foo} to ifdef::foo[] (diff) | |
| download | tgif-d1caa5895458443cc9535b6fda6ff8480383471b.tar.xz | |
Merge branch 'jk/asciidoc-markup-fix'
Various documentation mark-up fixes to make the output more
consistent in general and also make AsciiDoctor (an alternative
formatter) happier.
* jk/asciidoc-markup-fix:
doc: convert AsciiDoc {?foo} to ifdef::foo[]
doc: put example URLs and emails inside literal backticks
doc: drop backslash quoting of some curly braces
doc: convert \--option to --option
doc/add: reformat `--edit` option
doc: fix length of underlined section-title
doc: fix hanging "+"-continuation
doc: fix unquoted use of "{type}"
doc: fix misrendering due to `single quote'
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions