[PATCH 5/7] git push: Document that "nothing" is the future push default

[Finn Arne Gangstad <finnag@pvv.org>]

Signed-off-by: Finn Arne Gangstad <finnag@pvv.org>
---
 Documentation/RelNotes-1.6.3.txt |    7 +++++++
 builtin-push.c                   |    4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Documentation/RelNotes-1.6.3.txt b/Documentation/RelNotes-1.6.3.txt
index ee1fddb..87de02a 100644
--- a/Documentation/RelNotes-1.6.3.txt
+++ b/Documentation/RelNotes-1.6.3.txt
@@ -22,6 +22,13 @@ branch pointed at by its HEAD, gets a large warning.  You can choose what
 should happen upon such a push by setting the configuration variable
 receive.denyDeleteCurrent in the receiving repository.
 
+In a future release, the default of "git push" without further
+arguments will be to push nothing. Currently, it will push all
+matching refspecs to the current remote.  A configuration variable
+push.default has been introduced to select the default behaviour.  To
+ease the transition, a big warning is issued if this is not configured
+and a git push without arguments is attempted.
+
 
 Updates since v1.6.2
 --------------------
diff --git a/builtin-push.c b/builtin-push.c
index b9fe206..7ef499f 100644
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -79,11 +79,11 @@ static const char *warn_unconfigured_push_msg[] = {
 	"has not configured any push refspecs. The default action in this",
 	"case has been to push all matching refspecs, that is, all branches",
 	"that exist both locally and remotely will be updated.",
-	"This default may change in the future.",
+	"This default will change in the future.",
 	"",
 	"You can specify what action you want to take in this case, and",
 	"avoid seeing this message again, by configuring 'push.default' to:",
-	"  'nothing'  : Do not push anythig",
+	"  'nothing'  : Do not push anythig (the future default)",
 	"  'matching' : Push all matching branches (the current default)",
 	"  'current'  : Push the current branch to whatever it is tracking",
 	""
-- 
1.6.2.105.g6ff1f.dirty