summaryrefslogtreecommitdiff
path: root/Documentation/user-manual.txt
diff options
context:
space:
mode:
authorW. Trevor King <wking@tremily.us>2013-02-08 17:04:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-02-14 18:54:58 (GMT)
commitd9be2485e284d9d73b071b2946fff0b19f97aaa7 (patch)
treeb6e3a67a36fee57ba5936b51a5828a608a17356a /Documentation/user-manual.txt
parent7e2010537e96d0a1144520222f20ba1dc3d61441 (diff)
downloadgit-d9be2485e284d9d73b071b2946fff0b19f97aaa7.zip
git-d9be2485e284d9d73b071b2946fff0b19f97aaa7.tar.gz
git-d9be2485e284d9d73b071b2946fff0b19f97aaa7.tar.bz2
user-manual: Update for receive.denyCurrentBranch=refuse
acd2a45 (Refuse updating the current branch in a non-bare repository via push, 2009-02-11) changed the default to refuse such a push, but it forgot to update the docs. 7d182f5 (Documentation: receive.denyCurrentBranch defaults to 'refuse', 2010-03-17) updated Documentation/config.txt, but forgot to update the user manual. Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/user-manual.txt')
-rw-r--r--Documentation/user-manual.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 85651b5..7c534dc 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1986,9 +1986,10 @@ 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 ofthe 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