|
|
@ -4,6 +4,7 @@
|
|
|
|
status = auto
|
|
|
|
status = auto
|
|
|
|
branch = auto
|
|
|
|
branch = auto
|
|
|
|
[alias]
|
|
|
|
[alias]
|
|
|
|
|
|
|
|
cf = config --includes
|
|
|
|
co = commit
|
|
|
|
co = commit
|
|
|
|
com = commit -m
|
|
|
|
com = commit -m
|
|
|
|
coa = commit -a
|
|
|
|
coa = commit -a
|
|
|
@ -23,12 +24,12 @@
|
|
|
|
cb = checkout
|
|
|
|
cb = checkout
|
|
|
|
untrack = rm --cached
|
|
|
|
untrack = rm --cached
|
|
|
|
tg = "!f() { git tag -a $1 -m \"${2-$1}\" }; f"
|
|
|
|
tg = "!f() { git tag -a $1 -m \"${2-$1}\" }; f"
|
|
|
|
pu = "f() { git push && git push --tags }; f"
|
|
|
|
pu = "!f() { git push && git push --tags }; f"
|
|
|
|
sm = "!f() { git pull && git merge ${2-$(git config --get custom.serverbranch.remote)}/${1} && git push; }; f"
|
|
|
|
sm = "!f() { git pull && git merge ${2-$(git config --get custom.serverbranch.remote)}/${1} && git push; }; f"
|
|
|
|
submodule-del = "!f() { git submodule deinit -d -- ${1}; rm -rf .git/modules/${1}; git rm -f ${1}; }; f"
|
|
|
|
submodule-del = "!f() { git submodule deinit -d -- ${1}; rm -rf .git/modules/${1}; git rm -f ${1}; }; f"
|
|
|
|
[core]
|
|
|
|
[core]
|
|
|
|
editor = vim
|
|
|
|
editor = vim
|
|
|
|
autocrlf = input
|
|
|
|
autocrlf = false
|
|
|
|
[push]
|
|
|
|
[push]
|
|
|
|
default = current
|
|
|
|
default = current
|
|
|
|
[filter "lfs"]
|
|
|
|
[filter "lfs"]
|
|
|
@ -43,4 +44,4 @@
|
|
|
|
[difftool]
|
|
|
|
[difftool]
|
|
|
|
prompt = false
|
|
|
|
prompt = false
|
|
|
|
[include]
|
|
|
|
[include]
|
|
|
|
path = gitconfiguser
|
|
|
|
path = ~/.gitconfig.local
|
|
|
|