New email

diff --git a/.config/environment.d/10-email.conf b/.config/environment.d/10-email.conf
index 528a28bf8f4ff0f85f68da71577146a98791cdea..6a79860ee14538cd01e9b52e49e50d1473185016 100644 (file)
--- a/.config/environment.d/10-email.conf
+++ b/.config/environment.d/10-email.conf
@@ -1 +1 @@
-EMAIL=jamesbunton@delx.net.au
+EMAIL=jamesbunton@delx.au

diff --git a/.gitconfig b/.gitconfig
index a128061237e87a8a3468a38a47dcaad91924deff..13da5d5b07902817c3194a65a0bd3787b7a73d78 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -41,3 +41,6 @@
        mergediff = !git checkout --quiet --detach HEAD && git merge --no-edit origin/master && git diff -C10 -M10 origin/master && git checkout --quiet -
        expire-prune = !git reflog expire --expire=now --all && git gc --prune=now
        serve = daemon --reuseaddr --base-path=. --export-all --verbose
+[user]
+       email = jamesbunton@delx.au
+       name = James Bunton

diff --git a/.mailmap b/.mailmap
new file mode 100644 (file)
index 0000000..1e771ed
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+<jamesbunton@delx.au> <jamesbunton@delx.net.au>

diff --git a/README.md b/README.md
index 12cdd71b9d7cd70d79cd822e64d26c7f6877e305..72a4f59a1ec2511b107206f5a0f2da32297b51db 100644 (file)
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Configuration files for a bunch of Unix apps I use regularly.
 ## Basic setup
 
 ```
-git clone https://delx.net.au/git/dotfiles .dotfiles
+git clone https://code.delx.au/dotfiles .dotfiles
 ```
 
 
@@ -30,7 +30,7 @@ mkdir ~/.config/environment.d && ln -sf ~/.dotfiles/.config/environment.d/* ~/.c
 
 Clone the dotemacs repository:
 ```
-git clone https://delx.net.au/git/dotemacs ~/.emacs.d
+git clone https://code.delx.au/dotemacs ~/.emacs.d
 ```