From d9be2485e284d9d73b071b2946fff0b19f97aaa7 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 8 Feb 2013 12:04:20 -0500 Subject: [PATCH 1/2] 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 Signed-off-by: Junio C Hamano --- Documentation/user-manual.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 85651b57ae..7c534dc54b 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 <> 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 From 50995edda69b4d6d84452a392f0e1fa86280ac2c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 18 Feb 2013 12:43:00 -0800 Subject: [PATCH 2/2] user-manual: typofix (ofthe->of the) Noticed by Drew Northup Signed-off-by: Junio C Hamano --- Documentation/user-manual.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 7c534dc54b..299fc1e3ff 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -1988,7 +1988,7 @@ Note that the target of a "push" is normally a <> repository. You can also push to a 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 +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