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>
W. Trevor King committed
Feb 8, 2013 at 12:04 UTC
d9be2485e284d9d73b071b2946fff0b19f97aaa7
1 file changed
+4
-3
Documentation/user-manual.txt
+4
-3
@@ -1986,9 +1986,10 @@ handling this case.
1986
1987
Note that the target of a "push" is normally a
1988
<<def_bare_repository,bare>> repository. You can also push to a
1989
-repository that has a checked-out working tree, but the working tree
1990
-will not be updated by the push. This may lead to unexpected results if
1991
-the branch you push to is the currently checked-out branch!
1989
+repository that has a checked-out working tree, but a push to update the
1990
+currently checked-out branch is denied by default to prevent confusion.
1991
+See the description ofthe receive.denyCurrentBranch option
1992
+in linkgit:git-config[1] for details.
1993
1994
As with `git fetch`, you may also set up configuration options to
1995
save typing; so, for example, after