aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--config/git/config9
-rwxr-xr-xdeploy.sh3
-rw-r--r--gitconfig-local1
4 files changed, 12 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 432092d..edec80b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/deploy.sh b/deploy.sh
index 5ba66bb..7e5575b 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -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