summaryrefslogtreecommitdiff
path: root/Documentation/user-manual.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-02-14 16:06:29 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-02-14 16:06:29 -0800
commit17e45f8e41ed127f07b529068113c9f7e44cf6db (patch)
treec11ca8c935c9e709bfc9bacb57b59a469940968f /Documentation/user-manual.txt
parentMerge branch 'mk/make-rm-depdirs-could-be-empty' (diff)
parentuser-manual: Update for receive.denyCurrentBranch=refuse (diff)
downloadtgif-17e45f8e41ed127f07b529068113c9f7e44cf6db.tar.xz
Merge branch 'wk/man-deny-current-branch-is-default-these-days'
* wk/man-deny-current-branch-is-default-these-days: user-manual: Update for receive.denyCurrentBranch=refuse
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 32cadc3f73..a4778d725c 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/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