diff --git a/.gitconfig b/git/.gitconfig similarity index 88% rename from .gitconfig rename to git/.gitconfig index d9a70a4..23c80d2 100644 --- a/.gitconfig +++ b/git/.gitconfig @@ -5,6 +5,7 @@ autocrlf = input quotepath = false editor = /usr/local/bin/nvim + excludesfile = ~/.dotfile/git/.gitignore [alias] merge2 = "!f() { git checkout $1 && git merge $2 && git checkout -; }; f" au = add -u diff --git a/git/.gitignore b/git/.gitignore new file mode 100644 index 0000000..98974d3 --- /dev/null +++ b/git/.gitignore @@ -0,0 +1,30 @@ +*.a +*.so +_obj +_test +*.cgo1.go +*.cgo2.c +_cgo_defun.c +_cgo_gotypes.go +_cgo_export.* +_testmain.go +*.exe +*.exe~ +*.test +*.prof +*.rar +*.zip +*.gz +*.psd +*.bmd +*.cfg +*.pptx +*.log +*nohup.out +*settings.pyc +*.sublime-project +*.sublime-workspace +.idea/ +.vscode/ +.DS_Store +.log \ No newline at end of file diff --git a/init.sh b/init.sh index 084c12f..5b33d31 100644 --- a/init.sh +++ b/init.sh @@ -6,5 +6,5 @@ sh -c "$(wget https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/to ln -sf ~/.dotfile/.zshrc ~/ ln -sf ~/.dotfile/laily.zsh-theme ~/.oh-my-zsh/themes/ ln -sf ~/.dotfile/.tmux.conf ~/ -ln -sf ~/.dotfile/.gitconfig ~/.gitconfig +ln -sf ~/.dotfile/git/.gitconfig ~/.gitconfig