From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 4 May 2008 05:15:09 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.6-rc0~102
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/471793f91e4bd61bb809045c7088a30ee1305a19?ds=inline;hp=-c

Merge branch 'maint'

* maint:
checkout: don't rfc2047-encode oneline on detached HEAD
filter-branch: Documentation fix.
---

471793f91e4bd61bb809045c7088a30ee1305a19
diff --combined builtin-checkout.c
index 14b2fe7760,cf9875c13d..10ec137cce
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@@ -142,7 -142,7 +142,7 @@@ static void describe_detached_head(cha
  	struct strbuf sb;
  	strbuf_init(&sb, 0);
  	parse_commit(commit);
- 	pretty_print_commit(CMIT_FMT_ONELINE, commit, &sb, 0, "", "", 0, 0);
+ 	pretty_print_commit(CMIT_FMT_ONELINE, commit, &sb, 0, NULL, NULL, 0, 0);
  	fprintf(stderr, "%s %s... %s\n", msg,
  		find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV), sb.buf);
  	strbuf_release(&sb);
@@@ -504,7 -504,7 +504,7 @@@ int cmd_checkout(int argc, const char *
  		OPT__QUIET(&opts.quiet),
  		OPT_STRING('b', NULL, &opts.new_branch, "new branch", "branch"),
  		OPT_BOOLEAN('l', NULL, &opts.new_branch_log, "log for new branch"),
 -		OPT_SET_INT( 0 , "track",  &opts.track, "track",
 +		OPT_SET_INT('t', "track",  &opts.track, "track",
  			BRANCH_TRACK_EXPLICIT),
  		OPT_BOOLEAN('f', NULL, &opts.force, "force"),
  		OPT_BOOLEAN('m', NULL, &opts.merge, "merge"),