Documentation/merge-options.txt: order options in alphabetical groups

[git.git] / Documentation / git-commit.txt

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 6203461f41865b2205520d86d9f3bb85629709cc..0578a40d841348b5ae484e1fe15ce637ecc4b830 100644 (file)
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -8,7 +8,7 @@ git-commit - Record changes to the repository
 SYNOPSIS
 --------
 [verse]
 SYNOPSIS
 --------
 [verse]

-'git commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend]
+'git commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend] [--dry-run]

           [(-c | -C) <commit>] [-F <file> | -m <msg>]
           [--allow-empty] [--no-verify] [-e] [--author=<author>]
           [--cleanup=<mode>] [--] [[-i | -o ]<file>...]
           [(-c | -C) <commit>] [-F <file> | -m <msg>]
           [--allow-empty] [--no-verify] [-e] [--author=<author>]
           [--cleanup=<mode>] [--] [[-i | -o ]<file>...]


@@ -42,10 +42,9 @@ The content to be added can be specified in several ways:
    by one which files should be part of the commit, before finalizing the
    operation.  Currently, this is done by invoking 'git-add --interactive'.
 
    by one which files should be part of the commit, before finalizing the
    operation.  Currently, this is done by invoking 'git-add --interactive'.
 

-The 'git-status' command can be used to obtain a
+The `--dry-run` option can be used to obtain a

 summary of what is included by any of the above for the next
 summary of what is included by any of the above for the next

-commit by giving the same set of parameters you would give to
-this command.
+commit by giving the same set of parameters (options and paths).

 
 If you make a commit and then find a mistake immediately after
 that, you can recover from it with 'git-reset'.
 
 If you make a commit and then find a mistake immediately after
 that, you can recover from it with 'git-reset'.


@@ -166,7 +165,7 @@ FROM UPSTREAM REBASE" section in linkgit:git-rebase[1].)
        'git-commit' if any paths are given on the command line,
        in which case this option can be omitted.
        If this option is specified together with '--amend', then
        'git-commit' if any paths are given on the command line,
        in which case this option can be omitted.
        If this option is specified together with '--amend', then

-       no paths need be specified, which can be used to amend
+       no paths need to be specified, which can be used to amend

        the last commit without committing changes that have
        already been staged.
 
        the last commit without committing changes that have
        already been staged.
 


@@ -198,6 +197,11 @@ specified.
 --quiet::
        Suppress commit summary message.
 
 --quiet::
        Suppress commit summary message.
 

+--dry-run::
+       Do not create a commit, but show a list of paths that are
+       to be committed, paths with local changes that will be left
+       uncommitted and paths that are untracked.
+

 \--::
        Do not interpret any more arguments as options.
 
 \--::
        Do not interpret any more arguments as options.