Merge branch 'maint'

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

diff --combined builtin-checkout.c
index 14b2fe7760766c796d78fd910882c4ef8b917b98,cf9875c13da9c194e1f4ad4ce456ed09808b849b..10ec137ccec7d7f281562817d81a1035c4aa6124
--- 1/builtin-checkout.c
--- 2/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"),