aboutsummaryrefslogtreecommitdiff
path: root/stow/git
diff options
context:
space:
mode:
Diffstat (limited to 'stow/git')
-rw-r--r--stow/git/.config/git/config49
-rw-r--r--stow/git/.config/git/ignore11
2 files changed, 60 insertions, 0 deletions
diff --git a/stow/git/.config/git/config b/stow/git/.config/git/config
new file mode 100644
index 0000000..71bf668
--- /dev/null
+++ b/stow/git/.config/git/config
@@ -0,0 +1,49 @@
+[user]
+ name = Matt Singleton
+ email = matt@xcolour.net
+
+[alias]
+ st = status
+ ci = commit
+ br = branch
+ co = checkout
+ df = diff
+ lg = log -p
+
+[core]
+ whitespace = trailing-space,space-before-tab,cr-at-eol
+ editor = vim
+ autocrlf = input
+ excludesfile = ~/.config/git/ignore
+ pager = less -+$LESS -RSX
+
+[push]
+ default = nothing
+
+[color]
+ ui = true
+
+[mergetool]
+ keepTemporaries = false
+ prompt = false
+
+[mergetool "vimdiff"]
+ layout = "LOCAL,BASE,REMOTE / MERGED + BASE,LOCAL + BASE,REMOTE"
+
+[merge]
+ tool = vimdiff
+ conflictstyle = zdiff3
+
+[diff]
+ tool = vimdiff
+ colorMoved = default
+ algorithm = histogram
+
+[init]
+ defaultBranch = main
+
+[pull]
+ ff = only
+
+[include]
+ path = config-local
diff --git a/stow/git/.config/git/ignore b/stow/git/.config/git/ignore
new file mode 100644
index 0000000..57dd8e6
--- /dev/null
+++ b/stow/git/.config/git/ignore
@@ -0,0 +1,11 @@
+*.class
+*.pyc
+*.swo
+*.swp
+.svn
+.swo
+*#*
+#
+.#*
+doc/tags
+.DS_STORE