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 /git/config | |
| 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>
Diffstat (limited to '')
| -rw-r--r-- | git/config | 12 |
1 files changed, 12 insertions, 0 deletions
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 |