Nanana

git/gitconfig

@@ -12,6 +12,8 @@
   ci = commit
   rd = rebase -i development
   rh = rebase -i HEAD~5
+  unstage = reset
+  undo = reset --soft HEAD^
 [color]
   diff = auto
   status = auto
@@ -26,9 +28,19 @@
   whitespace = nowarn
 [mergetool]
   keepBackup = false
+  prompt = false
 [difftool]
   prompt = false
 [help]
   autocorrect = 1
 [achievement]
 	upload = true
+[difftool "Kaleidoscope"]
+  cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
+[diff]
+  tool = Kaleidoscope
+[mergetool "Kaleidoscope"]
+  cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
+  trustExitCode = true
+[merge]
+  tool = Kaleidoscope