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

gitster · gitster · commit 289ca27deefa · 2014-03-07T15:17:20.000-08:00
diff --git 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"
