Replace "git repo-config" with "git config" in help texts

It makes sense to still use git-repo-config instead of git-config in
the code, since the latter name is not available in older gits, but
it's better to use the new name in the help texts since the
overwhelming majority of users aren't going to use a very old git.

Signed-off-by: Karl Hasselström <kha@treskal.com>

diff --git a/examples/gitconfig b/examples/gitconfig
index e402208d75014a8a9d4aa372ec79ba0dc1528942..f1c653e8353e3ead01d8747b3f1f803c5f7f5c46 100644 (file)
--- a/examples/gitconfig
+++ b/examples/gitconfig
@@ -1,6 +1,6 @@
 # StGIT configuration file. Copy it to any of ~/.gitconfig or
 # .git/config and modify as needed. Note that the latter overrides
-# the former. The "git repo-config" command can be used as well
+# the former. The "git config" command can be used as well
 
 [user]
        # Default author/committer details (standard GIT variables)

diff --git a/stgit/stack.py b/stgit/stack.py
index 0ce9992fa09f67725ba12de664da0fdd9fc624f9..1ab10c5860c87e4d116a6f7d09550bfa79e98d56 100644 (file)
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -515,7 +515,7 @@ class Series(PatchSet):
             out.note(('No parent remote declared for stack "%s",'
                       ' defaulting to "origin".' % self.get_name()),
                      ('Consider setting "branch.%s.remote" and'
-                      ' "branch.%s.merge" with "git repo-config".'
+                      ' "branch.%s.merge" with "git config".'
                       % (self.get_name(), self.get_name())))
             return 'origin'
         else:
@@ -532,7 +532,7 @@ class Series(PatchSet):
             out.note(('No parent branch declared for stack "%s",'
                       ' defaulting to "heads/origin".' % self.get_name()),
                      ('Consider setting "branch.%s.stgit.parentbranch"'
-                      ' with "git repo-config".' % self.get_name()))
+                      ' with "git config".' % self.get_name()))
             return 'heads/origin'
         else:
             raise StackException, 'Cannot find a parent branch for "%s"' % self.get_name()