Merge branch 'us/printf-not-echo'

diff --git a/builtin/push.c b/builtin/push.c
index 3dd160c6b6a9a6af5010163f86b8a1ac2095dee1..f8dfea41e1ad8b6d888c1a2adc13eee87083491e 100644 (file)
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -58,7 +58,7 @@ static const char *map_refspec(const char *ref,
        }
 
        if (push_default == PUSH_DEFAULT_UPSTREAM &&
-           !prefixcmp(matched->name, "refs/heads/")) {
+           starts_with(matched->name, "refs/heads/")) {
                struct branch *branch = branch_get(matched->name + 11);
                if (branch->merge_nr == 1 && branch->merge[0]->src) {
                        struct strbuf buf = STRBUF_INIT;
@@ -216,7 +216,7 @@ N_("push.default is unset; its implicit value has changed in\n"
    "When push.default is set to 'matching', git will push local branches\n"
    "to the remote branches that already exist with the same name.\n"
    "\n"
-   "In Git 2.0, Git will default to the more conservative 'simple'\n"
+   "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
    "behavior, which only pushes the current branch to the corresponding\n"
    "remote branch that 'git pull' uses to update the current branch.\n"
    "\n"