Arti Zirk 5 months ago
parent
commit
f5dc53aa6d
  1. 8
      .gitconfig

8
.gitconfig

@ -4,6 +4,7 @@
[merge] [merge]
tool = meld tool = meld
conflictStyle = zdiff3 conflictStyle = zdiff3
keepbackup = false
[alias] [alias]
plog = log --graph --pretty=format:'%h -%d %s %n' --abbrev-commit --date=relative --branches plog = log --graph --pretty=format:'%h -%d %s %n' --abbrev-commit --date=relative --branches
@ -27,6 +28,7 @@
smtpServerPort = 587 smtpServerPort = 587
[diff] [diff]
wsErrorHighlight = all wsErrorHighlight = all
algorithm = histogram
[cola] [cola]
spellcheck = false spellcheck = false
[push] [push]
@ -58,3 +60,9 @@
allow = always allow = always
[column] [column]
ui = auto ui = auto
[rebase]
autosquash = true
[branch]
sort = -committerdate
[fetch]
prune = true

Loading…
Cancel
Save