use rebase/autostash on git pull
parent
8ac2ea31c2
commit
04a8c80a6c
|
@ -19,7 +19,7 @@
|
|||
prompt = false
|
||||
|
||||
[pull]
|
||||
rebase = false
|
||||
rebase = true
|
||||
|
||||
[color]
|
||||
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'
|
||||
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)'
|
||||
[rebase]
|
||||
autoStash = true
|
||||
|
|
Reference in New Issue