From 1e333ac7ed5398f93ac6edd7d79f2924ca97321e Mon Sep 17 00:00:00 2001
From: Ben Harris <ben@tilde.team>
Date: Mon, 24 Jun 2019 21:19:32 -0400
Subject: same_nick_middle, git aliases

---
 git/.gitconfig | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'git')

diff --git a/git/.gitconfig b/git/.gitconfig
index fedb489..5f218e0 100755
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -30,5 +30,9 @@
 	lol = log --oneline --graph --decorate --all
 	joke = !curl -s https://raw.githubusercontent.com/EugeneKay/git-jokes/lulz/Jokes.txt | shuf -n1
 	dad = !curl https://icanhazdadjoke.com
+	staged = diff --staged
+	ap = add --patch
+	local = log --oneline --no-merges ${1-$(git branch -lvv | perl -ne '/^\\\\*.*\\\\[(.*?)\\\\]/ and print \"$1\\n\"')}..HEAD
+	upstream = log --oneline --no-merges HEAD..${1-$(git branch -lvv | perl -ne '/^\\\\*.*\\\\[(.*?)\\\\]/ and print \"$1\\n\"')}
 [rerere]
 	enabled = true
-- 
cgit 1.4.1