splitting into more modular structure

2019-12-08 15:38:09 -08:00
parent ab1ef3fcbb
commit 1762d6246f
8 changed files with 39 additions and 6 deletions
--- a/12
+++ b/12
@@ -1,10 +1,13 @@
 [user]
-    name = Vasili Svirydau
-    email = vsvirydau@copperleaf.com
+    name = Vasili Sviridov
+    email = vasili@sviridov.ca

 [push]
    default = simple

+[pull]
+    rebase = true
+
 [core]
    editor = /usr/bin/vim

@@ -23,6 +26,7 @@

 [difftool "bcompare"]
    trustExitCode = true
-    cmd = bcompare "$LOCAL" "$REMOTE"
+    cmd = bcompare \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
+
 [alias]
-	ignore = "!gi() { curl -sL https://www.gitignore.io/api/$@ ;}; gi"
+    ignore = "!gi() { curl -sL https://www.gitignore.io/api/$@ ;}; gi"