git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Karl Hasselström" <kha@treskal.com>
To: Catalin Marinas <catalin.marinas@gmail.com>
Cc: git@vger.kernel.org
Subject: [StGIT PATCH 3/4] Replace "git repo-config" with "git config" in help texts
Date: Sun, 26 Aug 2007 22:26:26 +0200	[thread overview]
Message-ID: <20070826202626.15933.27528.stgit@yoghurt> (raw)
In-Reply-To: <20070826202309.15933.54183.stgit@yoghurt>

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>

---

 examples/gitconfig |    2 +-
 stgit/stack.py     |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/gitconfig b/examples/gitconfig
index e402208..f1c653e 100644
--- 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 0ce9992..1ab10c5 100644
--- 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()

  parent reply	other threads:[~2007-08-26 20:27 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-08-26 20:26 [StGIT PATCH 0/4] Miscellaneous fixes Karl Hasselström
2007-08-26 20:26 ` [StGIT PATCH 1/4] Don't use test_expect_failure when more than one thing could fail Karl Hasselström
2007-08-26 20:26 ` [StGIT PATCH 2/4] Don't write None to the conf file Karl Hasselström
2007-08-26 20:26 ` Karl Hasselström [this message]
2007-08-26 20:26 ` [StGIT PATCH 4/4] Compile regexp just once Karl Hasselström
2007-08-29 10:18 ` [StGIT PATCH 0/4] Miscellaneous fixes Catalin Marinas
2007-08-29 11:17   ` Karl Hasselström
2007-09-03  8:40     ` Catalin Marinas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070826202626.15933.27528.stgit@yoghurt \
    --to=kha@treskal.com \
    --cc=catalin.marinas@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).