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
This commit is contained in:
William Carroll 2018-09-04 14:57:04 -04:00
parent 6ebd90a946
commit a9fa9673dc

View file

@ -2,12 +2,13 @@
name = William Carroll name = William Carroll
email = wpcarro@gmail.com email = wpcarro@gmail.com
[alias] [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)\" 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) 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 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)\" yday = ! git log --name-only --since=yesterday.midnight --until=today.midnight --author=\"$(git config --get user.email)\"
patch-grep = log -p -S patch-grep = log -p -S
unstage = reset HEAD --
[credential] [credential]
helper = osxkeychain helper = osxkeychain
[push] [push]
@ -15,7 +16,12 @@
[rebase] [rebase]
autosquash = true autosquash = true
autostash = true autostash = true
[remote "origin"]
fetch = +refs/pull/*/head:refs/remotes/origin/pr/*
[github] [github]
user = wpcarro user = wpcarro
[core] [core]
excludesfile = ~/.gitignore excludesfile = ~/.gitignore
pager = less
[rerere]
enabled = true