rebase: implement --merge via the interactive machinery

diff --git a/Documentation/git-credential.txt b/Documentation/git-credential.txt
index 7da0f13a5cb26e9e5d1cb7d9c73fd4af57443d72..b2114403731157cbb370bff1d450fd52ee56f0fb 100644 (file)
--- a/Documentation/git-credential.txt
+++ b/Documentation/git-credential.txt
@@ -20,7 +20,7 @@ usernames and passwords. The git-credential command exposes this
 interface to scripts which may want to retrieve, store, or prompt for
 credentials in the same manner as Git. The design of this scriptable
 interface models the internal C API; see
-link:technical/api-credentials.txt[the Git credential API] for more
+link:technical/api-credentials.html[the Git credential API] for more
 background on the concepts.
 
 git-credential takes an "action" option on the command-line (one of