diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | config/git/config | 9 | ||||
| -rwxr-xr-x | deploy.sh | 3 | ||||
| -rw-r--r-- | gitconfig-local | 1 |
4 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,4 @@ vim/ dotfiles-backup config/zsh/zshrc-local +config/git/config-local diff --git a/config/git/config b/config/git/config index f68fed8..1823b5d 100644 --- a/config/git/config +++ b/config/git/config @@ -32,7 +32,12 @@ [diff] tool = meld + [init] - defaultBranch = main + defaultBranch = main + [pull] - ff = only + ff = only + +[include] + path = config-local @@ -44,3 +44,6 @@ vim +BundleClean +qall if [ ! -e config/zsh/zshrc-local ]; then cp zshrc-local config/zsh/zshrc-local fi +if [ ! -e config/git/config-local ]; then + cp gitconfig-local config/git/config-local +fi diff --git a/gitconfig-local b/gitconfig-local new file mode 100644 index 0000000..8076467 --- /dev/null +++ b/gitconfig-local @@ -0,0 +1 @@ +# Local (not source-controlled) overrides go here |