From b4a82263b64dc9b6171244c7716c85a2bf787918 Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Fri, 16 Sep 2016 14:07:49 -0700
Subject: [PATCH] [git] Add some aliases for rebase and merge process; clean up
 tabs in the config

---
 gitconfig | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/gitconfig b/gitconfig
index 6674009..a4c650f 100644
--- a/gitconfig
+++ b/gitconfig
@@ -4,11 +4,9 @@
 [core]
     editor = vim
     quotepath = false
-	excludesfile = ~/.gitignore
+    excludesfile = ~/.gitignore
 [color]
     ui = auto
-[merge]
-	tool = Kaleidoscope
 [alias]
     # Commits
     c = commit
@@ -35,9 +33,13 @@
 
     # Merges and rebases
     m = merge
+    ma = merge --abort
     mt = mergetool
     rb = rebase
     rbi = rebase --interactive
+    rbc = rebase --continue
+    rba = rebase --abort
+    rbs = rebase --skip
 
     # Resets, moving HEAD
     r = reset
@@ -49,21 +51,24 @@
 
     # Remotes
     p = push -u
+    pf = push -uf
     f = fetch
     sup = submodule update --recursive
 [ui]
     color = true
-[difftool "Kaleidoscope"]
-	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
 [diff]
-	tool = Kaleidoscope
+    tool = KS
+[difftool]
+    prompt = false
+[difftool "KS"]
+    cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
+[merge]
+    tool = KS
 [mergetool]
     keepBackup = true
-	prompt = false
-[difftool]
-	prompt = false
-[mergetool "Kaleidoscope"]
-	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
-	trustExitCode = true
+    prompt = false
+[mergetool "KS"]
+    cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
+    trustExitCode = true
 [push]
-	default = simple
+    default = simple