summaryrefslogtreecommitdiff
path: root/.gitconfig
diff options
context:
space:
mode:
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig18
1 files changed, 10 insertions, 8 deletions
diff --git a/.gitconfig b/.gitconfig
index c6a77dd..5948f58 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -2,11 +2,10 @@
excludesfile = ~/.gitignore
[user]
- #name = dakkar
+ name = dakkar
email = dakkar@thenautilus.net
- #signingkey = dakkar@thenautilus.net
- name = Gianni Ceccarelli
- email = gianni.ceccarelli@broadbean.com
+ signingkey = dakkar@thenautilus.net
+
[color]
ui = true
branch = true
@@ -30,6 +29,7 @@
prune = true
[fetch.fsck]
zeroPaddedFilemode = warn
+ badTimezone = warn
[push]
default = tracking
[pull]
@@ -49,7 +49,7 @@
[rerere]
enabled = true
[transfer]
- fsckobjects = true
+ fsckObjects = true
[grep]
patternType = perl
[alias]
@@ -61,6 +61,8 @@
st = status -bs
tracked = ls-tree -r --name-only --full-name HEAD
stashed = stash list --pretty=format:'%gd: %Cred%h%Creset %Cgreen[%ar]%Creset %gs'
-#[url "/home/dakkar/BB/repos/"]
-[url "ssh://git@bitbucket.org/"]
- insteadof = https://bitbucket.org/
+[includeIf "hasconfig:remote.*.url:https://bitbucket.org/broadbean/**"]
+ path = ~/.config/git/broadbean
+[includeIf "hasconfig:remote.*.url:git@bitbucket.org:broadbean/**"]
+ path = ~/.config/git/broadbean
+