diff options
| author | Mattias Andrée <maandree@kth.se> | 2021-06-25 19:36:07 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@kth.se> | 2021-06-25 19:36:07 +0200 |
| commit | 16c47a3969099a22c51fa3e1868b7c16be896e82 (patch) | |
| tree | 529e416b8f95fca1f7818eb9edeee865783bd2c6 | |
| parent | Fix bugs (diff) | |
| download | dotfiles-16c47a3969099a22c51fa3e1868b7c16be896e82.tar.gz dotfiles-16c47a3969099a22c51fa3e1868b7c16be896e82.tar.bz2 dotfiles-16c47a3969099a22c51fa3e1868b7c16be896e82.tar.xz | |
Add git config
Signed-off-by: Mattias Andrée <maandree@kth.se>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | git/Makefile | 4 | ||||
| -rw-r--r-- | git/config | 12 |
3 files changed, 17 insertions, 0 deletions
@@ -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 |