Merge branch 'maint'

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

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 2e62165fa9f48e1bff506b75895c081eb922b4ec..b5d81be7ecd60daa1a1d476441ca58e6b732d9ef 100644 (file)
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -29,7 +29,8 @@ The content to be added can be specified in several ways:
 
 3. by listing files as arguments to the 'commit' command, in which
    case the commit will ignore changes staged in the index, and instead
 
 3. by listing files as arguments to the 'commit' command, in which
    case the commit will ignore changes staged in the index, and instead

-   record the current content of the listed files;
+   record the current content of the listed files (which must already
+   be known to git);

 
 4. by using the -a switch with the 'commit' command to automatically
    "add" changes from all known files (i.e. all files that are already
 
 4. by using the -a switch with the 'commit' command to automatically
    "add" changes from all known files (i.e. all files that are already


@@ -94,7 +95,7 @@ OPTIONS
 
 -s::
 --signoff::
 
 -s::
 --signoff::

-       Add Signed-off-by line by the commiter at the end of the commit
+       Add Signed-off-by line by the committer at the end of the commit

        log message.
 
 -n::
        log message.
 
 -n::


@@ -165,7 +166,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.