summaryrefslogtreecommitdiff
path: root/Documentation/user-manual.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-25 16:26:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-02-25 16:26:59 (GMT)
commit6368a71b81427fbc0a7b004c6c1446ac09c64646 (patch)
treea9288cf2f12edf24d2280d8db5317cfb73bd611a /Documentation/user-manual.txt
parentb3600c36286517cda38df976946557ce3e87bd82 (diff)
parent50995edda69b4d6d84452a392f0e1fa86280ac2c (diff)
downloadgit-6368a71b81427fbc0a7b004c6c1446ac09c64646.zip
git-6368a71b81427fbc0a7b004c6c1446ac09c64646.tar.gz
git-6368a71b81427fbc0a7b004c6c1446ac09c64646.tar.bz2
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)
Diffstat (limited to 'Documentation/user-manual.txt')
-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 23689b0..1076588 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