~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update the tutorial for the conflict situations
[stgit]
/
contrib
/
stgit.el
diff --git
a/contrib/stgit.el
b/contrib/stgit.el
index
7ab17a9
..
9734cb4
100644
(file)
--- a/
contrib/stgit.el
+++ b/
contrib/stgit.el
@@
-1499,7
+1499,9
@@
If ONLY-PATCHES is not nil, exclude index and work tree."
(stgit-reload))
(defun stgit-goto ()
(stgit-reload))
(defun stgit-goto ()
- "Go to the patch on the current line."
+ "Go to the patch on the current line.
+
+Pops or pushes patches to make this patch topmost."
(interactive)
(stgit-assert-mode)
(let ((patchsym (stgit-patch-name-at-point t)))
(interactive)
(stgit-assert-mode)
(let ((patchsym (stgit-patch-name-at-point t)))