From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Feb 2013 18:01:21 +0000 (-0800)
Subject: Merge branch 'wk/man-deny-current-branch-is-default-these-days' into maint
X-Git-Tag: v1.8.1.5~6
X-Git-Url: https://repo.or.cz/w/git.git/commitdiff_plain/28db11169b53695827b180e4ee11c33bf2ec116a

Merge branch 'wk/man-deny-current-branch-is-default-these-days' into maint

* wk/man-deny-current-branch-is-default-these-days:
  user-manual: typofix (ofthe->of the)
  user-manual: Update for receive.denyCurrentBranch=refuse
---

28db11169b53695827b180e4ee11c33bf2ec116a
diff --cc Documentation/user-manual.txt
index 52c8523c7d,299fc1e3ff..20e5b4216d
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@@ -2004,26 -1986,22 +2004,27 @@@ handling this case
  
  Note that the target of a "push" is normally a
  <<def_bare_repository,bare>> repository.  You can also push to a
- repository that has a checked-out working tree, but the working tree
- will not be updated by the push.  This may lead to unexpected results if
- the branch you push to is the currently checked-out branch!
+ repository that has a checked-out working tree, but a push to update the
+ currently checked-out branch is denied by default to prevent confusion.
+ See the description of the receive.denyCurrentBranch option
+ in linkgit:git-config[1] for details.
  
  As with `git fetch`, you may also set up configuration options to
 -save typing; so, for example, after
 +save typing; so, for example:
 +
 +-------------------------------------------------
 +$ git remote add public-repo ssh://yourserver.com/~you/proj.git
 +-------------------------------------------------
 +
 +adds the following to `.git/config`:
  
  -------------------------------------------------
 -$ cat >>.git/config <<EOF
  [remote "public-repo"]
 -	url = ssh://yourserver.com/~you/proj.git
 -EOF
 +	url = yourserver.com:proj.git
 +	fetch = +refs/heads/*:refs/remotes/example/*
  -------------------------------------------------
  
 -you should be able to perform the above push with just
 +which lets you do the same push with just
  
  -------------------------------------------------
  $ git push public-repo master