diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-06-05 19:00:19 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-06-05 19:00:19 (GMT) |
commit | 96b7f93ac85ba09aaa82ecc86bf14cba481bbdbb (patch) | |
tree | 2d99b4b39a05bd23009a763d9ab602cca721bb45 /Documentation/diff-generate-patch.txt | |
parent | 51f319c08f55beb12cf1e1d4db9299434b9b1496 (diff) | |
parent | d0258b93e6eb95dd1169693dbcf12f0ae6f6a2eb (diff) | |
download | git-96b7f93ac85ba09aaa82ecc86bf14cba481bbdbb.zip git-96b7f93ac85ba09aaa82ecc86bf14cba481bbdbb.tar.gz git-96b7f93ac85ba09aaa82ecc86bf14cba481bbdbb.tar.bz2 |
Merge branch 'jk/asciidoc-markup-fix' into maint
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/diff-generate-patch.txt')
-rw-r--r-- | Documentation/diff-generate-patch.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt index 843a20b..bcf54da 100644 --- a/Documentation/diff-generate-patch.txt +++ b/Documentation/diff-generate-patch.txt @@ -77,7 +77,7 @@ combined diff format Any diff-generating command can take the `-c` or `--cc` option to produce a 'combined diff' when showing a merge. This is the default format when showing merges with linkgit:git-diff[1] or -linkgit:git-show[1]. Note also that you can give the `-m' option to any +linkgit:git-show[1]. Note also that you can give the `-m` option to any of these commands to force generation of diffs with individual parents of a merge. |