Merge branch 'cc/replace'

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 64f94cfe1293b627a17ff552c7983526425d1637..3ea80c820fb404d7b00436f9820fe8701f056ebf 100644 (file)
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'git commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend] [--dry-run]
-          [(-c | -C) <commit>] [-F <file> | -m <msg>] [--dry-run]
+          [(-c | -C) <commit>] [-F <file> | -m <msg>]
           [--allow-empty] [--no-verify] [-e] [--author=<author>]
           [--cleanup=<mode>] [--] [[-i | -o ]<file>...]
 
@@ -69,12 +69,6 @@ OPTIONS
        Like '-C', but with '-c' the editor is invoked, so that
        the user can further edit the commit message.
 
---dry-run::
-       Do not actually make a commit, but show the list of paths
-       with updates in the index, paths with changes in the work tree,
-       and paths that are untracked, similar to the one that is given
-       in the commit log editor.
-
 -F <file>::
 --file=<file>::
        Take the commit message from the given file.  Use '-' to
@@ -329,7 +323,7 @@ ENVIRONMENT AND CONFIGURATION VARIABLES
 The editor used to edit the commit log message will be chosen from the
 GIT_EDITOR environment variable, the core.editor configuration variable, the
 VISUAL environment variable, or the EDITOR environment variable (in that
-order).
+order).  See linkgit:git-var[1] for details.
 
 HOOKS
 -----