From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 7 Mar 2014 23:17:20 +0000 (-0800)
Subject: Merge branch 'gj/push-more-verbose-advice'
X-Git-Tag: v2.0.0-rc0~138
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/289ca27deefab9b145a156a30571d9d25a9ad17c?hp=2b4a888069b65ab7a6b6291a15ee044705222334

Merge branch 'gj/push-more-verbose-advice'
---

diff --git a/builtin/push.c b/builtin/push.c
index 3dd160c6b6..cd6c1646a5 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -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"