git-add--interactive: replace hunk recounting with apply --recount

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 1978e1bc2e6e0dbf2b34d9585d270c055e3e73a1..57a3a84be1a8ce00f845c8a095d58913d0a7ef03 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -483,10 +483,10 @@ other
        a pager.
 
 'GIT_SSH'::
-       If this environment variable is set then linkgit:git-fetch[1]
-       and linkgit:git-push[1] will use this command instead
+       If this environment variable is set then `git-fetch`
+       and `git-push` will use this command instead
        of `ssh` when they need to connect to a remote system.
-       The 'GIT_SSH' command will be given exactly two arguments:
+       The '$GIT_SSH' command will be given exactly two arguments:
        the 'username@host' (or just 'host') from the URL and the
        shell command to execute on that remote system.
 +
@@ -500,8 +500,8 @@ for further details.
 
 'GIT_FLUSH'::
        If this environment variable is set to "1", then commands such
-       as git-blame (in incremental mode), git-rev-list, git-log,
-       git-whatchanged, etc., will force a flush of the output stream
+       as `git-blame` (in incremental mode), `git-rev-list`, `git-log`,
+       and `git-whatchanged` will force a flush of the output stream
        after each commit-oriented record have been flushed.   If this
        variable is set to "0", the output of these commands will be done
        using completely buffered I/O.   If this environment variable is
@@ -593,7 +593,7 @@ SEE ALSO
 linkgit:gittutorial[7], linkgit:gittutorial-2[7],
 linkgit:giteveryday[7], linkgit:gitcvs-migration[7],
 linkgit:gitglossary[7], linkgit:gitcore-tutorial[7],
-link:user-manual.html[The Git User's Manual]
+linkgit:gitcli[7], link:user-manual.html[The Git User's Manual]
 
 GIT
 ---