diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 518bf19..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -gitconfiguser diff --git a/gitconfig b/gitconfig index 8a8c72a..84da8aa 100644 --- a/gitconfig +++ b/gitconfig @@ -4,6 +4,7 @@ status = auto branch = auto [alias] + cf = config --includes co = commit com = commit -m coa = commit -a @@ -23,12 +24,12 @@ cb = checkout untrack = rm --cached 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" submodule-del = "!f() { git submodule deinit -d -- ${1}; rm -rf .git/modules/${1}; git rm -f ${1}; }; f" [core] editor = vim - autocrlf = input + autocrlf = false [push] default = current [filter "lfs"] @@ -43,4 +44,4 @@ [difftool] prompt = false [include] - path = gitconfiguser + path = ~/.gitconfig.local