Merge branch 'jc/refuse-push-to-current'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 03:40:36 +0000 (19:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 03:40:36 +0000 (19:40 -0800)
* jc/refuse-push-to-current:
  receive-pack: explain what to do when push updates the current branch

1  2 
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,