From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael J Gruber Subject: Re: [PATCH] git-cherry.txt: Change symbol marks in graph. Date: Thu, 02 Dec 2010 09:09:31 +0100 Message-ID: <4CF7543B.6060900@drmicha.warpmail.net> References: <1291267093-29855-1-git-send-email-jari.aalto@cante.net> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: git@vger.kernel.org To: jari.aalto@cante.net X-From: git-owner@vger.kernel.org Thu Dec 02 09:11:56 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PO4Gg-0004wW-Ni for gcvg-git-2@lo.gmane.org; Thu, 02 Dec 2010 09:11:55 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753647Ab0LBILs (ORCPT ); Thu, 2 Dec 2010 03:11:48 -0500 Received: from out1.smtp.messagingengine.com ([66.111.4.25]:40972 "EHLO out1.smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752564Ab0LBILs (ORCPT ); Thu, 2 Dec 2010 03:11:48 -0500 Received: from compute2.internal (compute2.nyi.mail.srv.osa [10.202.2.42]) by gateway1.messagingengine.com (Postfix) with ESMTP id 18514402; Thu, 2 Dec 2010 03:11:47 -0500 (EST) Received: from frontend1.messagingengine.com ([10.202.2.160]) by compute2.internal (MEProxy); Thu, 02 Dec 2010 03:11:47 -0500 X-Sasl-enc: cMe/Jj8ZDC4Ui3S1agfy+R/PwzmP/Ld5rZAPr1meOePp 1291277506 Received: from localhost.localdomain (whitehead.math.tu-clausthal.de [139.174.44.12]) by mail.messagingengine.com (Postfix) with ESMTPSA id 8717640AB85; Thu, 2 Dec 2010 03:11:46 -0500 (EST) User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.12) Gecko/20101103 Fedora/1.0-0.33.b2pre.fc14 Lightning/1.0b3pre Thunderbird/3.1.6 In-Reply-To: <1291267093-29855-1-git-send-email-jari.aalto@cante.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: jari.aalto@cante.net venit, vidit, dixit 02.12.2010 06:18: > From: Jari Aalto 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 > --- > 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 branch > has its id (sha1) reported, prefixed by a symbol. The ones that have > equivalent change already > -in the branch are prefixed with a minus (-) sign, and those > -that only exist in the branch are prefixed with a plus (+) symbol: > +in the branch are prefixed with a equal (=) sign, and those "an equal" > +that only exist in the branch are prefixed with a question mark (?) symbol: > > - __*__*__*__*__> > + _*__*__*__*__> > / > fork-point > - \__+__+__-__+__+__-__+__> > + \__?__?__=__?__?__=__?__> > > > If a has been given then the commits along the branch up > @@ -34,7 +34,7 @@ to and including are not reported: > __*__*__*__*__> > / > fork-point > - \__*__*____-__+__> > + \__*__*____=__?__> > > > Because 'git cherry' compares the changeset rather than the commit id Other than the above Acked-by: Michael J Gruber