summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 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
<<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: