From ad301d475d9230ce4472d53ca2a734dd9a3e5db6 Mon Sep 17 00:00:00 2001
From: Max Bucknell <me@maxbucknell.com>
Date: Wed, 4 Mar 2020 15:21:48 +1100
Subject: [PATCH] Add some new git convenience

---
 bin/max-set-upstream  | 8 ++++++++
 git/gitconfig.symlink | 9 ++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100755 bin/max-set-upstream

diff --git a/bin/max-set-upstream b/bin/max-set-upstream
new file mode 100755
index 0000000..2e389b7
--- /dev/null
+++ b/bin/max-set-upstream
@@ -0,0 +1,8 @@
+#! /usr/bin/env bash
+
+function main {
+    local branch="$(git rev-parse --abbrev-ref HEAD)"
+    git branch --set-upstream-to="origin/$branch" "$branch"
+}
+
+main $1
diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 68d63d6..1599acf 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -9,7 +9,7 @@
   email = me@maxbucknell.com
 
 [alias]
-  dc = diff --cached
+  dc = diff --staged
   di = diff
   amend = commit --amend
   aa = add --all
@@ -23,7 +23,9 @@
   current-branch = rev-parse --abbrev-ref HEAD
   cl = clone
   ll = !max-git-log
+  uu = !max-set-upstream
   whodunnit = blame
+  peek = log -1
 
 [color]
   ui = auto
@@ -38,3 +40,8 @@
   user = maxbucknell
 [credential]
   helper = osxkeychain
+[filter "lfs"]
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+	process = git-lfs filter-process
+	required = true