diff --git a/gitconfig b/gitconfig index 1ade61b0e0dc473a31a7f120ef919dc4adfbd190..48ba93447b624f3950c2a3a618aba094842736e3 100644 --- a/gitconfig +++ b/gitconfig @@ -31,6 +31,7 @@ sti = status --ignored unstage = reset HEAD -- fs = !git fetch && git status + pf = pull --ff-only [diff "ansible-vault"] textconv = PAGER=cat ansible-vault view cachetextconv = false