From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Feb 2009 03:40:36 +0000 (-0800)
Subject: Merge branch 'jc/refuse-push-to-current'
X-Git-Tag: v1.6.2-rc0~14
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5d680a67d7909c89af96eba4a2d77abed606292b;p=git.git

Merge branch 'jc/refuse-push-to-current'

* jc/refuse-push-to-current:
  receive-pack: explain what to do when push updates the current branch
---

5d680a67d7909c89af96eba4a2d77abed606292b
diff --cc builtin-receive-pack.c
index 596dfe922,6f61c45fd..6de186c39
--- a/builtin-receive-pack.c
+++ b/builtin-receive-pack.c
@@@ -9,9 -9,10 +9,10 @@@
  #include "remote.h"
  #include "transport.h"
  
 -static const char receive_pack_usage[] = "git-receive-pack <git-dir>";
 +static const char receive_pack_usage[] = "git receive-pack <git-dir>";
  
  enum deny_action {
+ 	DENY_UNCONFIGURED,
  	DENY_IGNORE,
  	DENY_WARN,
  	DENY_REFUSE,