Merge commit '41101b951a29bdad781542ff17de6dc6af52ce5a' into suhailsh…

…ergill/bugfix
magit · Aug 5, 2012 · bdb97a4 · bdb97a4
2 parents 4497cf2 + 41101b9
commit bdb97a4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/magit.el b/magit.el
@@ -5585,7 +5585,8 @@ Return values:
          (commit (and (member 'commit (magit-section-context-type section))
                       (magit-section-info section)))
          (old-editor (getenv "GIT_EDITOR")))
-    (setenv "GIT_EDITOR" (locate-file "emacsclient" exec-path))
+    (setenv "GIT_EDITOR" (concat (locate-file "emacsclient" exec-path)
+                                 " -s " server-name))
     (unwind-protect
         (magit-run-git-async "rebase" "-i"
                              (or (and commit (concat commit "^"))