Merge branch 'jh/commit-status'

* jh/commit-status:
  t7502: test commit.status, --status and --no-status
  commit: support commit.status, --status, and --no-status

Conflicts:
	Documentation/git-commit.txt
	builtin-commit.c

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/git-commit.txt
index 5fb43f9320a71a50cdc36d3d5ce59ac1641dfd91,0e535184b1ad61eaa9bb75e16c2734bd650825de..d3a2dec21eb0323b535dfc696bceac3d6b66b2c7
--- 1/Documentation/git-commit.txt
--- 2/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@@ -11,7 -11,8 +11,8 @@@ SYNOPSI
  'git commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend] [--dry-run]
           [(-c | -C) <commit>] [-F <file> | -m <msg>] [--reset-author]
           [--allow-empty] [--no-verify] [-e] [--author=<author>]
-          [--date=<date>] [--cleanup=<mode>] [--] [[-i | -o ]<file>...]
 -         [--cleanup=<mode>] [--status | --no-status] [--]
++         [--date=<date>] [--cleanup=<mode>] [--status | --no-status] [--]
+          [[-i | -o ]<file>...]
  
  DESCRIPTION
  -----------

diff --cc builtin-commit.c
index 592b10396d1d6aa25d5d1c0aa27556c93c219877,095c1869e83dcb40d10ff0ac7931fe078a4a6763..e64487121059b1b4a618828095375c1a42e4e93e
--- 1/builtin-commit.c
--- 2/builtin-commit.c
+++ b/builtin-commit.c
@@@ -106,8 -97,7 +106,9 @@@ static struct option builtin_commit_opt
        OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"),
        OPT_FILENAME('t', "template", &template_file, "use specified template file"),
        OPT_BOOLEAN('e', "edit", &edit_flag, "force edit of commit"),
 +      OPT_STRING(0, "cleanup", &cleanup_arg, "default", "how to strip spaces and #comments from message"),
+       OPT_BOOLEAN(0, "status", &include_status, "include status in commit message template"),
 +      /* end commit message options */
  
        OPT_GROUP("Commit contents options"),
        OPT_BOOLEAN('a', "all", &all, "commit all changed files"),