aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.gitignore1
-rw-r--r--git/Makefile4
-rw-r--r--git/config12
3 files changed, 17 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 1189c62..150ed0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
*\#*
*~
+.secrets/
diff --git a/git/Makefile b/git/Makefile
index 253a708..3f9f161 100644
--- a/git/Makefile
+++ b/git/Makefile
@@ -2,11 +2,15 @@
include ../common.mk
install:
+ mkdir -p -- ~/.config/git
+ cat config ../.secrets/git/config > ~/.config/git/config
mkdir -p -- ~/.config/bash/aliases.d
test ! -d ~/.config/bash/aliases.d/git
ln -sf -- ~/.dotfiles/git/bash-aliases ~/.config/bash/aliases.d/git
uninstall:
+ -unlink -- ~/.config/git/config
+ -rmdir -- ~/.config/git
-unlink -- ~/.config/bash/aliases.d/git
-rmdir -- ~/.config/bash/aliases.d
diff --git a/git/config b/git/config
new file mode 100644
index 0000000..28ab974
--- /dev/null
+++ b/git/config
@@ -0,0 +1,12 @@
+[color]
+ diff = auto
+ status = auto
+ branch = auto
+[push]
+ default = matching
+[init]
+ defaultBranch = master
+[pull]
+ rebase = false
+[merge]
+ conflictStyle = diff3