summaryrefslogtreecommitdiff
path: root/Documentation/git-pull.txt
diff options
context:
space:
mode:
authorTom Prince <tom.prince@ualberta.net>2007-01-28 16:16:53 -0800
committerJunio C Hamano <junkio@cox.net>2007-01-28 16:16:53 -0800
commite0d10e1c63bc52b37bbec99b07deee794058d9b4 (patch)
tree6fa070c660ff481e226b10aadbec5b7bb3b95cc7 /Documentation/git-pull.txt
parent829a686f1b50ba96cac2d88494fa339efe0c0862 (diff)
downloadgit-e0d10e1c63bc52b37bbec99b07deee794058d9b4.tar.gz
[PATCH] Rename git-repo-config to git-config.
Signed-off-by: Tom Prince <tom.prince@ualberta.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-pull.txt')
-rw-r--r--Documentation/git-pull.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 3e5f115728..a81d68ccef 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/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