jari.aalto@xxxxxxxxx venit, vidit, dixit 02.12.2010 06:18: > From: Jari Aalto <jari.aalto@xxxxxxxxx> You don't need this line if it coincides with the mail header's From. > The common commit were marked with a minus sign (-), but that is > usually interpreted as something less or substracted. Use natural > equal sign (=). Commits that are not in upstream were marked with plus > sign (+) but a question mark (?) is visually a litle more striking > (erect) in context where all other signs are "flat". It also helps > visually impared to see difference between (* ... ?) as opposed to I assume you mean "(= ... ?)" etc. Or is "*" supposed to mean "[=-+]"? "git cherry" does not output "*". > similar signs (* ... +). Very good. After not having used cherry in a while, I always have to look up what "+" and "-" mean. "=" and "?" are self explaining. "=" and "+" would be also, but you're making a good point for "?". Also, often those additional commits are not really additional but applied with minor path-id-changing edits. > > Signed-off-by: Jari Aalto <jari.aalto@xxxxxxxxx> > --- > Documentation/git-cherry.txt | 10 +++++----- > 1 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt > index fed115a..f342582 100644 > --- a/Documentation/git-cherry.txt > +++ b/Documentation/git-cherry.txt > @@ -19,13 +19,13 @@ the 'git patch-id' program. > 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: > +in the <upstream> branch are prefixed with a equal (=) sign, and those "an equal" > +that only exist in the <head> branch are prefixed with a question mark (?) symbol: > > - __*__*__*__*__> <upstream> > + _*__*__*__*__> <upstream> > / > fork-point > - \__+__+__-__+__+__-__+__> <head> > + \__?__?__=__?__?__=__?__> <head> > > > If a <limit> has been given then the commits along the <head> branch up > @@ -34,7 +34,7 @@ to and including <limit> are not reported: > __*__*__*__*__> <upstream> > / > fork-point > - \__*__*__<limit>__-__+__> <head> > + \__*__*__<limit>__=__?__> <head> > > > Because 'git cherry' compares the changeset rather than the commit id Other than the above Acked-by: Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html