All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Thomas Rast <tr@thomasrast.ch>
Cc: git@vger.kernel.org, a.huemer@commend.com,
	"Michael S. Tsirkin" <mst@kernel.org>
Subject: Re: [RFC PATCH] Revamp git-cherry(1)
Date: Thu, 21 Nov 2013 11:26:08 -0800	[thread overview]
Message-ID: <xmqqli0h4kvj.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <3af3069696e3a59d513f1fef0ca797d103f6d882.1385033403.git.tr@thomasrast.ch> (Thomas Rast's message of "Thu, 21 Nov 2013 12:30:56 +0100")

Thomas Rast <tr@thomasrast.ch> writes:

>  NAME
>  ----
> -git-cherry - Find commits not merged upstream
> +git-cherry - Find commits not applied in upstream

Good.

> +Determine whether there are commits in `<head>..<upstream>` that are
> +equivalent to those in the range `<limit>..<head>`.
>  
> +The equivalence test is based on the diff, after removing whitespace
> +and line numbers.  git-cherry therefore detects when commits have been
> +"copied" by means of linkgit:git-cherry-pick[1], linkgit:git-am[1] or
> +linkgit:git-rebase[1].
>  
> +Outputs the SHA1 of every commit in `<limit>..<head>`, prefixed with
> +`-` for commits that have an equivalent in <upstream>, and `+` for
> +commits that do not.

Yeah, short-sweet-and-sufficient.

>  OPTIONS
>  -------
>  -v::
> -	Verbose.
> +	Verbose.  Currently shows the commit subjects next to their
> +	SHA1.

Whenever I see "Currently", it makes me wonder "why does it need to
say that? Is there a plan to change it soon, and if so where is the
plan described?".

> +EXAMPLES
> +--------
> +
> +git-cherry is frequently used in patch-based workflows (see
> +linkgit:gitworkflows[7]) to determine if a series of patches has been
> +applied by the upstream maintainer.  In such a workflow you might
> +create and send a topic branch like this (fill in appropriate
> +arguments for `...`):

I think the ASCII art commit graph that shows topology which we lost
by this patch gave a more intiutive sense of what "a topic branch
like this" looked like than an incomplete skeleton of a command
sequence that would be understood by those who already know how to
work with multiple branches.  Perhaps we want both?

Thanks.

> ++
> +------------
> +git checkout -b topic origin/master
> +# work and create some commits
> +git format-patch origin/master
> +git send-email ... 00*
> +------------

> +Later, you can whether your changes have been applied by saying (still
> +on `topic`):
> ++
> +------------
> +git fetch  # update your notion of origin/master
> +git cherry -v
> +------------
> ++
> +Note that this uses , and assumes that
> +`core.autosetupmerge` is enabled (the default).
> +
> +
>  SEE ALSO
>  --------
>  linkgit:git-patch-id[1]

  parent reply	other threads:[~2013-11-21 19:26 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 [this message]
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
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=xmqqli0h4kvj.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=a.huemer@commend.com \
    --cc=git@vger.kernel.org \
    --cc=mst@kernel.org \
    --cc=tr@thomasrast.ch \
    /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.