From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Dec 2011 20:02:39 +0000 (-0800)
Subject: Sync with v1.7.8.1
X-Git-Tag: v1.7.9-rc0~33
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e443bdfe1e8e1ef8b3665cfd1c1295bd73e13773;p=git.git

Sync with v1.7.8.1
---

e443bdfe1e8e1ef8b3665cfd1c1295bd73e13773
diff --cc builtin/commit.c
index 626036a17,b02e2c4e8..be1ab2e25
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@@ -139,10 -138,10 +139,10 @@@ static struct option builtin_commit_opt
  	OPT_STRING('C', "reuse-message", &use_message, "commit", "reuse message from specified commit"),
  	OPT_STRING(0, "fixup", &fixup_message, "commit", "use autosquash formatted message to fixup specified commit"),
  	OPT_STRING(0, "squash", &squash_message, "commit", "use autosquash formatted message to squash specified commit"),
- 	OPT_BOOLEAN(0, "reset-author", &renew_authorship, "the commit is authored by me now (used with -C-c/--amend)"),
+ 	OPT_BOOLEAN(0, "reset-author", &renew_authorship, "the commit is authored by me now (used with -C/-c/--amend)"),
  	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_BOOL('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 */