Merge branch 'maint-1.7.0' into maint

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index f4a2b8c89776b704df598560209ab9ad7f9023cf..b586c0f442afd33c2875af26b83bb261de7361b0 100644 (file)
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -9,10 +9,10 @@ SYNOPSIS
 --------
 [verse]
 'git commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend] [--dry-run]
-          [(-c | -C | --fixup) <commit>] [-F <file> | -m <msg>]
+          [(-c | -C | --fixup | --squash) <commit>] [-F <file> | -m <msg>]
           [--reset-author] [--allow-empty] [--allow-empty-message] [--no-verify]
           [-e] [--author=<author>] [--date=<date>] [--cleanup=<mode>]
-          [--status | --no-status] [--] [[-i | -o ]<file>...]
+          [--status | --no-status] [-i | -o] [--] [<file>...]
 
 DESCRIPTION
 -----------
@@ -76,6 +76,13 @@ OPTIONS
        commit with a prefix of "fixup! ".  See linkgit:git-rebase[1]
        for details.
 
+--squash=<commit>::
+       Construct a commit message for use with `rebase --autosquash`.
+       The commit message subject line is taken from the specified
+       commit with a prefix of "squash! ".  Can be used with additional
+       commit message options (`-m`/`-c`/`-C`/`-F`). See
+       linkgit:git-rebase[1] for details.
+
 --reset-author::
        When used with -C/-c/--amend options, declare that the
        authorship of the resulting commit now belongs of the committer.