summaryrefslogtreecommitdiffstats
path: root/git-pull.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-01-29 02:55:48 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-01-29 02:55:48 +0000
commit7ad22dc9253e1434fcf289ab9cfe23067018e0a9 (patch)
tree6217f4d8ca0acb648ef008c1ae5463a82a0dc8f7 /git-pull.txt
parent5a70233d40122ee513dac43224df67ece82e2a0a (diff)
downloadgit-htmldocs-7ad22dc9253e1434fcf289ab9cfe23067018e0a9.tar.gz
Autogenerated HTML docs for v1.5.0-rc2-72-gdf391
Diffstat (limited to 'git-pull.txt')
-rw-r--r--git-pull.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-pull.txt b/git-pull.txt
index 3e5f11572..a81d68cce 100644
--- a/git-pull.txt
+++ b/git-pull.txt
@@ -42,7 +42,7 @@ git pull, git pull origin::
current branch. Normally the branch merged in is
the HEAD of the remote repository, but the choice is
determined by the branch.<name>.remote and
- branch.<name>.merge options; see gitlink:git-repo-config[1]
+ branch.<name>.merge options; see gitlink:git-config[1]
for details.
git pull origin next::
@@ -94,7 +94,7 @@ gitlink:git-reset[1].
SEE ALSO
--------
-gitlink:git-fetch[1], gitlink:git-merge[1], gitlink:git-repo-config[1]
+gitlink:git-fetch[1], gitlink:git-merge[1], gitlink:git-config[1]
Author