diff --git a/Gruntfile.js b/Gruntfile.js
index d94787c..0f14c93 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -113,7 +113,7 @@ module.exports = function(grunt) {
                         },
                         {
                             config: 'config.editor',
-                            default: 'subl',
+                            default: 'subl -n -w',
                             message: 'Which editor would you like to use?'
                         },
                         {
diff --git a/templates/.gitconfig b/templates/.gitconfig
index c88bb48..eac583f 100644
--- a/templates/.gitconfig
+++ b/templates/.gitconfig
@@ -72,4 +72,5 @@
     # the usual default is to push all branches
     default = tracking
 [core]
+    editor = <%- editor %>
     excludesfile = ~/.gitignore_global
\ No newline at end of file