From: Junio C Hamano 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://www.git.lorimer.id.au/gitweb.git/diff_plain/28db11169b53695827b180e4ee11c33bf2ec116a?hp=c054ef9be2dd1ea722130628b2feb46d0ac88f6d 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 --- diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 52c8523c7d..20e5b4216d 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -2004,9 +2004,10 @@ handling this case. Note that the target of a "push" is normally a <> 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: