summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-02-25 08:26:59 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-02-25 08:26:59 -0800
commit6368a71b81427fbc0a7b004c6c1446ac09c64646 (patch)
treea9288cf2f12edf24d2280d8db5317cfb73bd611a
parentSync with v1.8.1.4 (diff)
parentuser-manual: typofix (ofthe->of the) (diff)
downloadtgif-6368a71b81427fbc0a7b004c6c1446ac09c64646.tar.xz
Merge branch 'wk/man-deny-current-branch-is-default-these-days'
* wk/man-deny-current-branch-is-default-these-days: user-manual: typofix (ofthe->of the)
-rw-r--r--Documentation/user-manual.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 23689b0b93..1076588d6f 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -2006,7 +2006,7 @@ 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 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