A new merge stragety 'subtree'.

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

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 9c8435306845cd417ce014d24240a52e8110e42d..53a7bb0895036e4d66086b8c656e74588c82c38c 100644 (file)
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -3,13 +3,14 @@ git-commit(1)
 
 NAME
 ----
 
 NAME
 ----

-git-commit - Record your changes
+git-commit - Record changes to the repository

 
 SYNOPSIS
 --------
 [verse]
 
 SYNOPSIS
 --------
 [verse]

-'git-commit' [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>]
-          [--no-verify] [--amend] [-e] [--author <author>]
+'git-commit' [-a | --interactive] [-s] [-v]
+          [(-c | -C) <commit> | -F <file> | -m <msg> | --amend]
+          [--no-verify] [-e] [--author <author>]

           [--] [[-i | -o ]<file>...]
 
 DESCRIPTION
           [--] [[-i | -o ]<file>...]
 
 DESCRIPTION


@@ -35,6 +36,10 @@ methods:
    before, and to automatically "rm" files that have been
    removed from the working tree, and perform the actual commit.
 
    before, and to automatically "rm" files that have been
    removed from the working tree, and perform the actual commit.
 

+5. by using the --interactive switch with the 'commit' command to decide one
+   by one which files should be part of the commit, before finalizing the
+   operation.  Currently, this is done by invoking `git-add --interactive`.
+

 The gitlink:git-status[1] command can be used to obtain a
 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
 The gitlink:git-status[1] command can be used to obtain a
 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


@@ -111,7 +116,7 @@ but can be used to amend a merge commit.
        are concluding a conflicted merge.
 
 -q|--quiet::
        are concluding a conflicted merge.
 
 -q|--quiet::

-       Supress commit summary message.
+       Suppress commit summary message.

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