From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 Jan 2010 00:00:07 +0000 (-0800)
Subject: Merge branch 'jh/commit-status'
X-Git-Tag: v1.7.0-rc0~89
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f8eb50f60b5c8efda3529fcf89517080c686ce0b;p=git.git

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
---

f8eb50f60b5c8efda3529fcf89517080c686ce0b
diff --cc Documentation/git-commit.txt
index 5fb43f932,0e535184b..d3a2dec21
--- a/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 592b10396,095c1869e..e64487121
--- a/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"),