diff --git a/git/gitconfig b/git/gitconfig index c4d8c45..1dd8254 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -25,6 +25,9 @@ size = "!git diff --cached --binary | wc -c | numfmt --to=iec-i" x = "!exec " unstage = reset HEAD -- + up = pull --rebase --autostash + ignore = update-index --assume-unchanged + noignore = update-index --no-assume-unchanged [push] default = matching [core] @@ -48,7 +51,7 @@ recentrepo = /home/stonewareslord/git/sync recentrepo = /home/stonewareslord/git/school/service-garage [filter "lfs"] - required = true - clean = git-lfs clean -- %f - smudge = git-lfs smudge -- %f - process = git-lfs filter-process + required = true + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process