diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-27 10:01:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-27 10:01:21 -0800 |
| commit | 28db11169b53695827b180e4ee11c33bf2ec116a (patch) | |
| tree | e49b3956cbc52c728b99190c4edffbba9996c73d /Documentation/user-manual.txt | |
| parent | c054ef9be2dd1ea722130628b2feb46d0ac88f6d (diff) | |
| parent | 50995edda69b4d6d84452a392f0e1fa86280ac2c (diff) | |
| download | git-28db11169b53695827b180e4ee11c33bf2ec116a.tar.gz | |
Merge branch 'wk/man-deny-current-branch-is-default-these-days' into maint
* wk/man-deny-current-branch-is-default-these-days:
user-manual: typofix (ofthe->of the)
user-manual: Update for receive.denyCurrentBranch=refuse
Diffstat (limited to 'Documentation/user-manual.txt')
| -rw-r--r-- | Documentation/user-manual.txt | 7 |
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: |