Merge branch 'jh/commit-status'
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 Jan 2010 00:00:07 +0000 (16:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Jan 2010 00:00:07 +0000 (16:00 -0800)
* 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

1  2 
Documentation/config.txt
Documentation/git-commit.txt
builtin-commit.c

Simple merge
@@@ -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
  -----------
@@@ -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"),