From: Thomas Rast <tr@thomasrast.ch>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, a.huemer@commend.com,
"Michael S. Tsirkin" <mst@kernel.org>, Jeff King <peff@peff.net>
Subject: Re: [PATCH v2] Revamp git-cherry(1)
Date: Fri, 22 Nov 2013 20:37:14 +0100 [thread overview]
Message-ID: <87li0gi5xx.fsf@linux-k42r.v.cablecom.net> (raw)
In-Reply-To: <xmqqa9gw1bne.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Fri, 22 Nov 2013 11:25:57 -0800")
Junio C Hamano <gitster@pobox.com> writes:
> We are listing those that need to be added to the upstream with "+",
> while listing those that can be dropped from yours if you rebase
> with "-". Hinting the rationale behind the choice of "+/-"
> somewhere may help as a mnemonic to the readers (see below).
[...]
> And the earlier "why +/-" could be done after this picture,
> perhaps like:
>
> Here, we see that the commits A and C (marked with `-`) can
> be dropped from your `topic` branch when you rebase it on
> top of `origin/master`, while the commit B (marked with `+`)
> still needs to be kept so that it will be sent to be applied
> to `origin/master`.
>
> or somesuch?
Good idea, thanks. Will integrate this more "what still needs to be
integrated"-minded wording into a v3.
--
Thomas Rast
tr@thomasrast.ch
next prev parent reply other threads:[~2013-11-22 19:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-21 11:30 [RFC PATCH] Revamp git-cherry(1) Thomas Rast
2013-11-21 11:54 ` Jeff King
2013-11-21 20:58 ` Thomas Rast
2013-11-21 19:26 ` Junio C Hamano
2013-11-21 21:02 ` Thomas Rast
2013-11-21 22:04 ` Junio C Hamano
2013-11-22 16:29 ` [PATCH v2] " Thomas Rast
2013-11-22 19:25 ` Junio C Hamano
2013-11-22 19:37 ` Thomas Rast [this message]
2013-11-22 19:39 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87li0gi5xx.fsf@linux-k42r.v.cablecom.net \
--to=tr@thomasrast.ch \
--cc=a.huemer@commend.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mst@kernel.org \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.