diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-05 12:00:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-05 12:00:19 -0700 |
| commit | 96b7f93ac85ba09aaa82ecc86bf14cba481bbdbb (patch) | |
| tree | 2d99b4b39a05bd23009a763d9ab602cca721bb45 /Documentation/git-rebase.txt | |
| parent | 51f319c08f55beb12cf1e1d4db9299434b9b1496 (diff) | |
| parent | d0258b93e6eb95dd1169693dbcf12f0ae6f6a2eb (diff) | |
| download | git-96b7f93ac85ba09aaa82ecc86bf14cba481bbdbb.tar.xz | |
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/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 47984e84ed..1d01baa5fc 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -80,7 +80,7 @@ remain the checked-out branch. If the upstream branch already contains a change you have made (e.g., because you mailed a patch which was applied upstream), then that commit will be skipped. For example, running `git rebase master` on the -following history (in which A' and A introduce the same set of changes, +following history (in which `A'` and `A` introduce the same set of changes, but have different committer information): ------------ |