|
|
@@ -8,10 +8,12 @@
|
|
|
[diff]
|
|
|
algorithm = patience
|
|
|
[push]
|
|
|
- default = matching
|
|
|
+ default = simple
|
|
|
[alias]
|
|
|
root = !pwd
|
|
|
assume = update-index --assume-unchanged
|
|
|
unassume = update-index --no-assume-unchanged
|
|
|
assumed = "!git ls-files -v | grep ^h | cut -c 3-"
|
|
|
lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset' --abbrev-commit"
|
|
|
+ po = push origin
|
|
|
+ pof = push origin --force-with-lease
|
