diff --git a/home/dot_config/git/config b/home/dot_config/git/config index 772df2c..603e1e5 100644 --- a/home/dot_config/git/config +++ b/home/dot_config/git/config @@ -46,7 +46,8 @@ [mergetool "vimdiff"] cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' [push] - default = simple + default = current + autoSetupRemote = true [alias] lg = log --graph --pretty=format:'%Cred%h%Creset %G? %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset' --date=short hist = log --graph --full-history --all --pretty=format:'%Cred%h%Creset %G? %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset' --date=short