diff options
| author | Sebastian Schuberth <sschuberth@gmail.com> | 2013-09-06 22:03:22 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-06 14:49:06 -0700 |
| commit | d5ff3b4be5b2e3eee9c4b298f00ed7a4c1c556a4 (patch) | |
| tree | 9c8c988cc71bdbdc0b959c7af40b11e0601d75b9 /Documentation/git-rebase.txt | |
| parent | d2dbd399fa03b37ce797ed6fc609574a7e677079 (diff) | |
| download | git-d5ff3b4be5b2e3eee9c4b298f00ed7a4c1c556a4.tar.gz | |
Documentation: make AsciiDoc links always point to HTML filesss/doclinks
AsciiDoc's "link" is supposed to create hyperlinks for HTML output, so
prefer a "link" to point to an HTML file instead of a text file if an HTML
version of the file is being generated. For RelNotes, keep pointing to
text files as no equivalent HTML files are generated.
If appropriate, also update the link description to not contain the linked
file's extension.
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 6b2e1c86ab..94e07fdab5 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -322,7 +322,7 @@ You may find this (or --no-ff with an interactive rebase) helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to "revert the reversion" (see the -link:howto/revert-a-faulty-merge.txt[revert-a-faulty-merge How-To] for details). +link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details). --ignore-whitespace:: --whitespace=<option>:: @@ -416,7 +416,7 @@ Without --interactive, this is a synonym for --force-rebase. You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to "revert the reversion" (see the -link:howto/revert-a-faulty-merge.txt[revert-a-faulty-merge How-To] for details). +link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details). include::merge-strategies.txt[] |