penguincoder
/
bare-dotfiles
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use rebase/autostash on git pull

master
Andrew Coleman 2020-08-03 11:54:20 -04:00
parent 8ac2ea31c2
commit 04a8c80a6c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitconfig
View File

@ -19,7 +19,7 @@
prompt = false prompt = false
[pull] [pull]
rebase = false rebase = true
[color] [color]
branch = auto branch = auto
@ -53,3 +53,5 @@
--pretty=format:'%C(auto)%h%Creset %C(auto)%d%Creset %s %C(green)(%ad) %C(bold cyan)<%an>%Creset' --pretty=format:'%C(auto)%h%Creset %C(auto)%d%Creset %s %C(green)(%ad) %C(bold cyan)<%an>%Creset'
up = pull --rebase up = pull --rebase
branches-last-updated = branch -rv --sort=committerdate --format='%(HEAD) %(color:green)%(committerdate:relative)%(color:reset)\t%(color:magenta)%(authorname)%(color:reset)\t%(color:yellow)%(refname:short)%(color:reset)' branches-last-updated = branch -rv --sort=committerdate --format='%(HEAD) %(color:green)%(committerdate:relative)%(color:reset)\t%(color:magenta)%(authorname)%(color:reset)\t%(color:yellow)%(refname:short)%(color:reset)'
[rebase]
autoStash = true