~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Patch to clarify the "unsolved conflicts" message in Stacked Git
[stgit]
/
contrib
/
stgit.el
diff --git
a/contrib/stgit.el
b/contrib/stgit.el
index
b66a1ca
..
21ef28a
100644
(file)
--- a/
contrib/stgit.el
+++ b/
contrib/stgit.el
@@
-25,7
+25,7
@@
(cd dir)
(unless (eq 0 (call-process "git" nil t nil
"rev-parse" "--show-cdup"))
(cd dir)
(unless (eq 0 (call-process "git" nil t nil
"rev-parse" "--show-cdup"))
- (error "
cannot find top-level git tree for %s.
" dir))))))
+ (error "
Cannot find top-level git tree for %s
" dir))))))
(expand-file-name (concat (file-name-as-directory dir)
(car (split-string cdup "\n")))))))
(expand-file-name (concat (file-name-as-directory dir)
(car (split-string cdup "\n")))))))
@@
-406,7
+406,7
@@
find copied files."
"Show status using `git-status'."
(interactive)
(unless (fboundp 'git-status)
"Show status using `git-status'."
(interactive)
(unless (fboundp 'git-status)
- (error "
stgit-git-status
requires git-status"))
+ (error "
The stgit-git-status command
requires git-status"))
(let ((dir default-directory))
(save-selected-window
(pop-to-buffer nil)
(let ((dir default-directory))
(save-selected-window
(pop-to-buffer nil)
@@
-849,9
+849,9
@@
With prefix argument, refresh the marked patch or the patch under point."
(let ((patchargs (if arg
(let ((patches (stgit-patches-marked-or-at-point)))
(cond ((null patches)
(let ((patchargs (if arg
(let ((patches (stgit-patches-marked-or-at-point)))
(cond ((null patches)
- (error "
n
o patch to update"))
+ (error "
N
o patch to update"))
((> (length patches) 1)
((> (length patches) 1)
- (error "
t
oo many patches selected"))
+ (error "
T
oo many patches selected"))
(t
(cons "-p" patches))))
nil)))
(t
(cons "-p" patches))))
nil)))