diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-17 14:34:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-17 14:34:00 -0700 |
| commit | e6f28d0b6c239f15760194c8b12afdaa1a7bdd34 (patch) | |
| tree | b782d1e78feb1a9f17131581d754b0e29abaa0b8 /git-rebase.txt | |
| parent | 0e0e0d2656a57fd3628bb6dbdaf0096684ed24a9 (diff) | |
| download | git-htmldocs-e6f28d0b6c239f15760194c8b12afdaa1a7bdd34.tar.gz | |
Autogenerated HTML docs for v1.8.4-357-g8d83
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 6b2e1c86a..94e07fdab 100644 --- a/git-rebase.txt +++ b/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[] |