summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorGreg Jacobson <coder5000@gmail.com>2013-10-04 14:20:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-11-13 22:12:23 (GMT)
commitc13a5fe47b03cc115985ec79bff00b5510023092 (patch)
tree9a80bb2786f4d4bcd25af88fcf4674ba175e2ef6 /builtin
parent6ba01babcd37e92e88221fcf35ee4471aa66bf4c (diff)
downloadgit-c13a5fe47b03cc115985ec79bff00b5510023092.zip
git-c13a5fe47b03cc115985ec79bff00b5510023092.tar.gz
git-c13a5fe47b03cc115985ec79bff00b5510023092.tar.bz2
push: enhance unspecified push default warning
When the unset push.default warning message is displayed this may be the first time many users encounter push.default. Explain in the warning message in a compact manner what push.default is and what the change means to the end-user to help the users decide. Signed-off-by: Greg Jacobson <coder5000@gmail.com> Helped-by: Jonathan Nieder <jrnieder@gmail.com> Helped-by: Matthieu Moy <Matthieu.Moy@imag.fr> Helped-by: Marc Branchaud <marcnarc@xiplink.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/push.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/builtin/push.c b/builtin/push.c
index 7b1b66c..a73982a 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -174,6 +174,13 @@ N_("push.default is unset; its implicit value is changing in\n"
"\n"
" git config --global push.default simple\n"
"\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"
+ "behavior, which only pushes the current branch to the corresponding\n"
+ "remote branch that 'git pull' uses to update the current branch.\n"
+ "\n"
"See 'git help config' and search for 'push.default' for further information.\n"
"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
"'current' instead of 'simple' if you sometimes use older versions of Git)");