From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 Jan 2010 05:37:06 +0000 (-0800)
Subject: Merge branch 'maint-1.6.3' into maint-1.6.4
X-Git-Tag: v1.6.5.8~5^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=814035c12a07927ea03350184a14f869cdce7276;p=git.git

Merge branch 'maint-1.6.3' into maint-1.6.4

* maint-1.6.3:
  base85: Make the code more obvious instead of explaining the non-obvious
  base85: encode_85() does not use the decode table
  base85 debug code: Fix length byte calculation
  checkout -m: do not try to fall back to --merge from an unborn branch
  branch: die explicitly why when calling "git branch [-a|-r] branchname".
  textconv: stop leaking file descriptors
  commit: --cleanup is a message option
  git count-objects: handle packs bigger than 4G
  t7102: make the test fail if one of its check fails

Conflicts:
	builtin-commit.c
---

814035c12a07927ea03350184a14f869cdce7276
diff --cc builtin-commit.c
index 4bcce06fb,0e72a5657..26c3cc4e5
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@@ -86,16 -86,18 +86,18 @@@ static int opt_parse_m(const struct opt
  static struct option builtin_commit_options[] = {
  	OPT__QUIET(&quiet),
  	OPT__VERBOSE(&verbose),
- 	OPT_GROUP("Commit message options"),
  
+ 	OPT_GROUP("Commit message options"),
 -	OPT_STRING('F', "file", &logfile, "FILE", "read log from file"),
 +	OPT_FILENAME('F', "file", &logfile, "read log from file"),
  	OPT_STRING(0, "author", &force_author, "AUTHOR", "override author for commit"),
  	OPT_CALLBACK('m', "message", &message, "MESSAGE", "specify commit message", opt_parse_m),
  	OPT_STRING('c', "reedit-message", &edit_message, "COMMIT", "reuse and edit message from specified commit "),
  	OPT_STRING('C', "reuse-message", &use_message, "COMMIT", "reuse message from specified commit"),
  	OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"),
 -	OPT_STRING('t', "template", &template_file, "FILE", "use specified template file"),
 +	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"),
+ 	/* end commit message options */
  
  	OPT_GROUP("Commit contents options"),
  	OPT_BOOLEAN('a', "all", &all, "commit all changed files"),