summaryrefslogtreecommitdiff
path: root/builtin/push.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-07 23:17:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-03-07 23:17:20 (GMT)
commit289ca27deefab9b145a156a30571d9d25a9ad17c (patch)
treefcab9860411440ec3be2068f59a49598a88d6b29 /builtin/push.c
parent2b4a888069b65ab7a6b6291a15ee044705222334 (diff)
parent11037ee7e3057e60d765d6f77dd154e83323dfcd (diff)
downloadgit-289ca27deefab9b145a156a30571d9d25a9ad17c.zip
git-289ca27deefab9b145a156a30571d9d25a9ad17c.tar.gz
git-289ca27deefab9b145a156a30571d9d25a9ad17c.tar.bz2
Merge branch 'gj/push-more-verbose-advice'
Diffstat (limited to 'builtin/push.c')
-rw-r--r--builtin/push.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/push.c b/builtin/push.c
index 3dd160c..cd6c164 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"