The way it was worded could potentially lead people to delete branches
even though they still contained changes which should be preserved.
>From the git-cherry(1) man page:
#+begin_quote
Every commit that doesn’t exist in the <upstream> branch has its id
(sha1) reported, prefixed by a symbol. The ones that have equivalent
change already in the <upstream> branch are prefixed with a minus (-)
sign, and those that only exist in the <head> branch are prefixed with
a plus (+) symbol.
#+end_quote
Signed-off-by: Pieter Praet <[email protected]>
---
magit-cherry.el | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/magit-cherry.el b/magit-cherry.el
index 0783ced..bfc8bf4 100644
--- a/magit-cherry.el
+++ b/magit-cherry.el
@@ -58,12 +58,12 @@ (defun magit--refresh-cherry-buffer (cherry-upstream
cherry-head)
(abbreviate-file-name default-directory))
(format "Branch head: %s\n" (or branch-head "nothing committed (yet)"))
"\n"
- (format "%s means: present in '%s' but not in '%s'\n"
+ (format "%s means: equivalent exists in '%s'\n"
(propertize " - " 'face 'magit-diff-del)
- cherry-upstream cherry-head)
- (format "%s means: present in '%s' but not in '%s'\n"
+ cherry-upstream)
+ (format "%s means: only exists in '%s'\n"
(propertize " + " 'face 'magit-diff-add)
- cherry-head cherry-upstream)
+ cherry-head)
"\n"
(propertize "Cherry commits:" 'face 'magit-section-title) "\n"))
(magit-git-section 'commit nil 'magit--wash-cherry-output
--
1.7.11.1
--
---
You received this message because you are subscribed to the Google Groups
"magit" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
