diff options
Diffstat (limited to '.gitconfig')
| -rw-r--r-- | .gitconfig | 29 |
1 files changed, 26 insertions, 3 deletions
@@ -14,23 +14,40 @@ showbranch = true status = true +[color.diff] + oldMoved = normal red + oldMovedDimmed = normal red dim + oldMovedAlternative = normal red italic + oldMovedAlternativeDimmed = normal red italic dim + newMoved = normal green + newMovedDimmed = normal green dim + newMovedAlternative = normal green italic + newMovedAlternativeDimmed = normal green italic dim + [fetch] - prune = true + prune = true +[fetch.fsck] + zeroPaddedFilemode = warn [push] default = tracking [pull] - rebase = preserve + rebase = merges [diff] mnemonicprefix = true renames = copies + colorMoved = zebra +[merge] + conflictstyle = diff3 [log] decorate = short date = iso [rebase] stat = true autosquash = true +[rerere] + enabled = true [transfer] - fsckobjects = true + #fsckobjects = true [grep] patternType = perl [alias] @@ -41,3 +58,9 @@ refl = log -g --oneline 'HEAD@{now}' --date=relative st = status -bs tracked = ls-tree -r --name-only --full-name HEAD + stashed = stash list --pretty=format:'%gd: %Cred%h%Creset %Cgreen[%ar]%Creset %gs' +[filter "lfs"] + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true |