From a9fa9673dc54ae99fbecff55fe1148ff0641571e Mon Sep 17 00:00:00 2001
From: William Carroll <wpcarro@gmail.com>
Date: Tue, 4 Sep 2018 14:57:04 -0400
Subject: Update git preferences

- enable rerere
- prefer less, since bat is my default pager, which doesn't look great
  when looking at diffs, patches, etc
- fix broken alias
- support another alias
---
 configs/shared/git/.gitconfig | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'configs/shared')

diff --git a/configs/shared/git/.gitconfig b/configs/shared/git/.gitconfig
index e6d0e7b9bc47..39c302498c21 100644
--- a/configs/shared/git/.gitconfig
+++ b/configs/shared/git/.gitconfig
@@ -2,12 +2,13 @@
 	name = William Carroll
 	email = wpcarro@gmail.com
 [alias]
-	recent = for-each-ref --count=10 --sort=-committerdate refs/heads/ --format=\"%(refname:short)\"
+	recent = ! git for-each-ref --count=10 --sort=-committerdate refs/heads/ --format=\"%(refname:short)\" | fzf | xargs git checkout
 	today = ! git log --date=relative --since=00:00:00 --all --no-merges --oneline --author=\"$(git config --get user.email)\"
 	changed-files = ! git --no-pager diff --name-only $(current_branch) $(git merge-base $(current_branch) master)
 	conflicts = ! git --no-pager diff --name-only --diff-filter=U
 	yday = ! git log --name-only --since=yesterday.midnight --until=today.midnight --author=\"$(git config --get user.email)\"
 	patch-grep = log -p -S
+	unstage = reset HEAD --
 [credential]
 	helper = osxkeychain
 [push]
@@ -15,7 +16,12 @@
 [rebase]
 	autosquash = true
 	autostash = true
+[remote "origin"]
+  fetch = +refs/pull/*/head:refs/remotes/origin/pr/*
 [github]
 	user = wpcarro
 [core]
 	excludesfile = ~/.gitignore
+	pager = less
+[rerere]
+	enabled = true
-- 
cgit 1.4.1