diff --git a/.gitconfig b/.gitconfig index 55f229f..950eac9 100644 --- a/.gitconfig +++ b/.gitconfig @@ -61,6 +61,8 @@ }; f" code-changes = "!git log --format=format: --name-only | egrep -v '^$' | sort | uniq -c | sort -rg | head -10" cc = "!git code-changes" + fixup = "commit --fixup" + ri = "rebase -i --autosquash" [branch] #New branch track remote #autosetupmerge = always @@ -132,3 +134,10 @@ diff = /usr/share/git/diff-highlight/diff-highlight | less [interactive] diffFilter = /usr/share/git/diff-highlight/diff-highlight +[filter "lfs"] + required = true + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process +[pull] + rebase = true