diff --git a/.gitconfig.MKAYSIGREP b/.gitconfig.MKAYSIGREP
index d1ac6507..bc2b6a2d 100644
--- a/.gitconfig.MKAYSIGREP
+++ b/.gitconfig.MKAYSIGREP
@@ -3,12 +3,15 @@
     email = mikaela.suomalainen@outlook.com
     signingkey = 0xDAA6CA08F2E96AC7
 [alias]
-    # From https://github.com/blog/985-git-io-github-url-shortener#comment-15121
-    shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
-    # From http://progit.org/book/ch2-7.html
-    last = cat-file commit HEAD
     cleandi = clean -di
     cleandix = clean -dix
+    # From http://progit.org/book/ch2-7.html
+    last = cat-file commit HEAD
+    # From https://github.com/blog/985-git-io-github-url-shortener#comment-15121
+    mergen = merge --no-ff
+    pulln = pull --no-ff
+    shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
+
 [core]
     editor = vim
     autocrlf = input
diff --git a/gitconfig b/gitconfig
index c06f16e4..5133cbb4 100644
--- a/gitconfig
+++ b/gitconfig
@@ -3,12 +3,15 @@
 #    email = mikaela.suomalainen@outlook.com
 #    signingkey = 0xDAA6CA08F2E96AC7
 [alias]
-    # From https://github.com/blog/985-git-io-github-url-shortener#comment-15121
-    shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
-    # From http://progit.org/book/ch2-7.html
-    last = cat-file commit HEAD
     cleandi = clean -di
     cleandix = clean -dix
+    # From http://progit.org/book/ch2-7.html
+    last = cat-file commit HEAD
+    # From https://github.com/blog/985-git-io-github-url-shortener#comment-15121
+    mergen = merge --no-ff
+    pulln = pull --no-ff
+    shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
+
 [core]
     editor = vim
     autocrlf = input