aboutsummaryrefslogtreecommitdiffstats
path: root/git/config
diff options
context:
space:
mode:
Diffstat (limited to 'git/config')
-rw-r--r--git/config12
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