diff options
Diffstat (limited to '')
| -rw-r--r-- | git/Makefile | 4 | ||||
| -rw-r--r-- | git/config | 12 |
2 files changed, 16 insertions, 0 deletions
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 |