summaryrefslogtreecommitdiffstats
path: root/user-manual.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-15 15:23:28 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-15 15:23:28 -0800
commit0292db3986d09450dc3666f193b5b5cdcd646f31 (patch)
treeeaece2aab9bc14e6ab51e8afbf8785d027a31b82 /user-manual.txt
parent97cc08f5827dea14476b5c0c9a6acb89945e87aa (diff)
downloadgit-htmldocs-0292db3986d09450dc3666f193b5b5cdcd646f31.tar.gz
Autogenerated HTML docs for v1.8.1.3-619-g7b6e7
Diffstat (limited to 'user-manual.txt')
-rw-r--r--user-manual.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/user-manual.txt b/user-manual.txt
index 32cadc3f7..a4778d725 100644
--- a/user-manual.txt
+++ b/user-manual.txt
@@ -1987,9 +1987,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