about summary refs log tree commit diff
path: root/git
diff options
context:
space:
mode:
authorBen Harris <ben@tilde.team>2019-06-24 21:19:32 -0400
committerBen Harris <ben@tilde.team>2019-06-24 21:19:32 -0400
commit1e333ac7ed5398f93ac6edd7d79f2924ca97321e (patch)
tree8d891707f70c9aff22a26165c02705bd05743cbf /git
parent9a912b77964e3dbcdc19fc254bca7ca68d32ad23 (diff)
same_nick_middle, git aliases
Diffstat (limited to 'git')
-rwxr-xr-xgit/.gitconfig4
1 files changed, 4 insertions, 0 deletions
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