aboutsummaryrefslogtreecommitdiff
path: root/git
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2016-07-04 16:08:43 +1200
committerTom Ryder <tom@sanctum.geek.nz>2016-07-04 16:08:43 +1200
commit8ebef9fbb4c0eb5e98a1ed185a4f3263a30953d5 (patch)
tree88f37bcae03e91b732f05ce6615aa544a41bdf47 /git
parenta150718e3ad2c5b7d4cfd351e97d968f32151abb (diff)
downloaddotfiles-8ebef9fbb4c0eb5e98a1ed185a4f3263a30953d5.tar.gz
dotfiles-8ebef9fbb4c0eb5e98a1ed185a4f3263a30953d5.zip
Template .gitconfig personal values
Doing this in preference to relying on GIT_* environment variables. I don't like the default values in the Makefile very much; I'll need to figure out something nicer at some point.
Diffstat (limited to 'git')
-rw-r--r--git/gitconfig39
-rw-r--r--git/gitconfig.m432
2 files changed, 32 insertions, 39 deletions
diff --git a/git/gitconfig b/git/gitconfig
deleted file mode 100644
index 5fbe38c4..00000000
--- a/git/gitconfig
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# The user section is intentionally left undefined here, because the name and
-# email I want to use for commits varies between contexts and machines (most
-# notably when I'm on a work machine). I therefore use an un-versioned script
-# in ~/.profile.d to do this that looks something like the following:
-#
-# GIT_AUTHOR_NAME='Tom Ryder'
-# GIT_AUTHOR_EMAIL='tom@sanctum.geek.nz'
-# GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME
-# GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL
-# export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL
-#
-[advice]
- statusHints = false
-
-[alias]
- others = ls-files --others --exclude-standard
-
-[color]
- ui = true
-
-[diff]
- tool = vimdiff
-
-[difftool]
- prompt = false
-
-[grep]
- extendRegexp = true
- lineNumber = true
-
-[log]
- date = local
-
-[push]
- default = matching
-
-[status]
- short = true
diff --git a/git/gitconfig.m4 b/git/gitconfig.m4
new file mode 100644
index 00000000..0397cb93
--- /dev/null
+++ b/git/gitconfig.m4
@@ -0,0 +1,32 @@
+[advice]
+ statusHints = false
+
+[alias]
+ others = ls-files --others --exclude-standard
+
+[color]
+ ui = true
+
+[diff]
+ tool = vimdiff
+
+[difftool]
+ prompt = false
+
+[grep]
+ extendRegexp = true
+ lineNumber = true
+
+[log]
+ date = local
+
+[push]
+ default = matching
+
+[status]
+ short = true
+
+[user]
+ name = Tom Ryder
+ email = tom@sanctum.geek.nz
+ signingKey = 0xC14286EA77BB8872