stgitrc, gitconfig: Move the StGIT configuration to gitconfig.

The various porcelains seems to be converging on the core Git
configuration file as being a good place to put stuff, and I can see
why.

diff --git a/gitconfig b/gitconfig
index 13c883008cc695c50c7823b4f1bee2a6105f1d0b..9be32a3163305ec9c33d2670728fda397c6cb1b3 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -47,6 +47,10 @@
                        --no-signed-off-by-cc \
                        --to"
 
                        --no-signed-off-by-cc \
                        --to"
 

+[stgit]
+       autoresolved = yes
+       smtpdelay = 0
+

 [mail "alias"]
        git = git@vger.kernel.org
        mdw = mdw@distorted.org.uk
 [mail "alias"]
        git = git@vger.kernel.org
        mdw = mdw@distorted.org.uk

diff --git a/setup b/setup
index ec629c451860bd8abbd3f0fecf47101ef1529fff..caa7b4bdd13ba5827844a1c7899f7c415804e18b 100755 (executable)
--- a/setup
+++ b/setup
@@ -145,7 +145,7 @@ dotfiles="
   bash_profile bash_logout bashrc inputrc bash_completion
   emacs emacs-calc
   vm mailrc signature
   bash_profile bash_logout bashrc inputrc bash_completion
   emacs emacs-calc
   vm mailrc signature

-  gitconfig cgrc stgitrc tigrc
+  gitconfig cgrc tigrc

   lisp-init.lisp:.cmucl-init.lisp
     lisp-init.lisp:.sbclrc
     lisp-init.lisp:.clisprc.lisp
   lisp-init.lisp:.cmucl-init.lisp
     lisp-init.lisp:.sbclrc
     lisp-init.lisp:.clisprc.lisp

diff --git a/stgitrc b/stgitrc
deleted file mode 100644 (file)
index c0b97a9..0000000
--- a/stgitrc
+++ /dev/null
@@ -1,8 +0,0 @@
-### StGIT configuration
-
-[stgit]
-## Author/committer details
-authname: Mark Wooding
-authemail: mdw@distorted.org.uk
-commname: Mark Wooding
-commemail: mdw@distorted.org.uk