branch: elpa/magit
commit 9b81df36b4eb6d2443632cb44c67acd8ea1f366f
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit-stash-read-message: Fix previous commit
The first default/future-history-element is also *the* default.
---
lisp/magit-stash.el | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/lisp/magit-stash.el b/lisp/magit-stash.el
index a4b57047961..4ceea526c32 100644
--- a/lisp/magit-stash.el
+++ b/lisp/magit-stash.el
@@ -173,16 +173,15 @@ while two prefix arguments are equivalent to `--all'."
The message that Git would have picked, is available as the
default (used when the user enters the empty string) and as
-the second future history element. The first future history
+the first future history element. The second future history
element is just \"On BRANCH: \". Future history elements can
be accessed using \\<minibuffer-local-map>\\[next-history-element])."
(let ((branch (or (magit-get-current-branch) "(no branch)"))
(ellipsis (magit--ellipsis)))
(read-string (format "Stash message (default: On%s:%s): " ellipsis
ellipsis)
nil nil
- (list (format "On %s: " branch)
- (format "On %s: %s" branch
- (magit-rev-format "%h %s"))))))
+ (list (format "On %s: %s" branch (magit-rev-format "%h %s"))
+ (format "On %s: " branch)))))
(defun magit-stash-read-message-traditional ()
"Read a message from the minibuffer, to be used for a stash.