user-manual: repo-config -> config

Looks like we're going to allow git-config as the preferred alias to
git-repo-config, so let's document that instead.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 663fe9b8a3bc0130c9579596fecf7ceb1a471e62..3e367a0adb039e915dec0555251a40d96a9a3feb 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1450,7 +1450,7 @@ $ git pull
 -------------------------------------------------
 
 See the descriptions of the branch.<name>.remote and
 -------------------------------------------------
 
 See the descriptions of the branch.<name>.remote and

-branch.<name>.merge options in gitlink:git-repo-config[1] to learn
+branch.<name>.merge options in gitlink:git-config[1] to learn

 how to control these defaults depending on the current branch.
 
 In addition to saving you keystrokes, "git pull" also helps you by
 how to control these defaults depending on the current branch.
 
 In addition to saving you keystrokes, "git pull" also helps you by


@@ -1685,7 +1685,7 @@ $ git push public-repo master
 -------------------------------------------------
 
 See the explanations of the remote.<name>.url, branch.<name>.remote,
 -------------------------------------------------
 
 See the explanations of the remote.<name>.url, branch.<name>.remote,

-and remote.<name>.push options in gitlink:git-repo-config[1] for
+and remote.<name>.push options in gitlink:git-config[1] for

 details.
 
 Setting up a shared repository
 details.
 
 Setting up a shared repository


@@ -1999,10 +1999,10 @@ Configuring remote branches
 We saw above that "origin" is just a shortcut to refer to the
 repository which you originally cloned from.  This information is
 stored in git configuration variables, which you can see using
 We saw above that "origin" is just a shortcut to refer to the
 repository which you originally cloned from.  This information is
 stored in git configuration variables, which you can see using

-gitlink:git-repo-config[1]:
+gitlink:git-config[1]:

 
 -------------------------------------------------
 
 -------------------------------------------------

-$ git-repo-config -l
+$ git config -l

 core.repositoryformatversion=0
 core.filemode=true
 core.logallrefupdates=true
 core.repositoryformatversion=0
 core.filemode=true
 core.logallrefupdates=true


@@ -2017,7 +2017,7 @@ create similar configuration options to save typing; for example,
 after
 
 -------------------------------------------------
 after
 
 -------------------------------------------------

-$ git repo-config remote.example.url git://example.com/proj.git
+$ git config remote.example.url git://example.com/proj.git

 -------------------------------------------------
 
 then the following two commands will do the same thing:
 -------------------------------------------------
 
 then the following two commands will do the same thing:


@@ -2030,7 +2030,7 @@ $ git fetch example master:refs/remotes/example/master
 Even better, if you add one more option:
 
 -------------------------------------------------
 Even better, if you add one more option:
 
 -------------------------------------------------

-$ git repo-config remote.example.fetch master:refs/remotes/example/master
+$ git config remote.example.fetch master:refs/remotes/example/master

 -------------------------------------------------
 
 then the following commands will all do the same thing:
 -------------------------------------------------
 
 then the following commands will all do the same thing:


@@ -2045,7 +2045,7 @@ $ git fetch example
 You can also add a "+" to force the update each time:
 
 -------------------------------------------------
 You can also add a "+" to force the update each time:
 
 -------------------------------------------------

-$ git repo-config remote.example.fetch +master:ref/remotes/example/master
+$ git config remote.example.fetch +master:ref/remotes/example/master

 -------------------------------------------------
 
 Don't do this unless you're sure you won't mind "git fetch" possibly
 -------------------------------------------------
 
 Don't do this unless you're sure you won't mind "git fetch" possibly


@@ -2053,9 +2053,9 @@ throwing away commits on mybranch.
 
 Also note that all of the above configuration can be performed by
 directly editing the file .git/config instead of using
 
 Also note that all of the above configuration can be performed by
 directly editing the file .git/config instead of using

-gitlink:git-repo-config[1].
+gitlink:git-config[1].

 
 

-See gitlink:git-repo-config[1] for more details on the configuration
+See gitlink:git-config[1] for more details on the configuration

 options mentioned above.
 
 
 options mentioned above.