summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2018-07-21 13:38:47 +0200
committerAlan Pearce2018-07-21 13:38:47 +0200
commit6388f7523ae56bd642b0038967804eadabfe214e (patch)
tree2a6954cce3a47c762f9e626cc9f6a2c88789cfd6
parent79560be18d43a971e9bfc6dfa910ce8ef40a2860 (diff)
downloaddotfiles-6388f7523ae56bd642b0038967804eadabfe214e.tar.lz
dotfiles-6388f7523ae56bd642b0038967804eadabfe214e.tar.zst
dotfiles-6388f7523ae56bd642b0038967804eadabfe214e.zip
git: workaround bulkworkspaces weirdness
-rw-r--r--git/.config/git/config2
-rw-r--r--git/.config/git/config-satoshipay4
2 files changed, 3 insertions, 3 deletions
diff --git a/git/.config/git/config b/git/.config/git/config
index b839fd4..321862d 100644
--- a/git/.config/git/config
+++ b/git/.config/git/config
@@ -50,3 +50,5 @@
 [merge "npm-merge-driver"]
 	name = automatically merge npm lockfiles
 	driver = npx npm-merge-driver merge %A %O %B %P
+[bulkworkspaces]
+	satoshipay = /home/alan/projects/github.com/satoshipay
\ No newline at end of file
diff --git a/git/.config/git/config-satoshipay b/git/.config/git/config-satoshipay
index 2b2e3bc..5fedb7d 100644
--- a/git/.config/git/config-satoshipay
+++ b/git/.config/git/config-satoshipay
@@ -1,4 +1,2 @@
 [user]
-email = alan@satoshipay.io
-[bulkworkspaces]
-	satoshipay = /home/alan/projects/github.com/satoshipay
\ No newline at end of file
+email = alan@satoshipay.io
\ No newline at end of file