diff options
| author | William Carroll <wpcarro@gmail.com> | 2018-09-04T18·57-0400 |
|---|---|---|
| committer | William Carroll <wpcarro@gmail.com> | 2018-09-04T18·57-0400 |
| commit | a9fa9673dc54ae99fbecff55fe1148ff0641571e (patch) | |
| tree | 146e57dc69370e39648970e4925bd74abdfbc3aa /configs/shared | |
| parent | 6ebd90a946c9d7082fb9e35c29e5e6d9ba6e0b54 (diff) | |
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
Diffstat (limited to 'configs/shared')
| -rw-r--r-- | configs/shared/git/.gitconfig | 8 |
1 files changed, 7 insertions, 1 deletions
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 |