From: Junio C Hamano <junkio@cox•net>
To: Linus Torvalds <torvalds@linux-foundation•org>
Cc: Alex Bennee <kernel-hacker@bennee•com>, git@vger•kernel.org
Subject: Re: How can I easily verify my diffs are in parent branch?
Date: Wed, 04 Apr 2007 22:25:05 -0700 [thread overview]
Message-ID: <7vircbwfym.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <Pine.LNX.4.64.0704040744160.6730@woody.linux-foundation.org> (Linus Torvalds's message of "Wed, 4 Apr 2007 08:12:20 -0700 (PDT)")
Linus Torvalds <torvalds@linux-foundation•org> writes:
> So to compare all patch-ID's, you can do
>
> git cherry cvs-upstream my-branch
>
> adn it should look at all the commits that are in *your* branch but not
> upstream, and report their ID's preceded by a "-" if they are upstream,
> and a "+" if they are not.
>
> You can then look at the "+" commits more closely, to see whether maybe
> they actually did get merged, but got changed/fixed in the process, or
> whether they really are missing.
Funny.
Last night I was thinking about git-cherry, as it is one of the
few commands that have "funny parameter semantics that do not
mesh well with git-log family" (others are format-patch and
rebase).
I think we should be able to use --left-right and ... operator
to express what the above cherry does with something like:
$ git log --left-right --ignore-common-patch cvs-upstream...my-branch
The --ignore-common-patch option does not exist yet, but the
basic code to implement it should already be accessible from the
log family, as that is what format-patch needs to do.
next prev parent reply other threads:[~2007-04-05 5:25 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-04 11:36 How can I easily verify my diffs are in parent branch? Alex Bennee
2007-04-04 12:28 ` Alex Riesen
2007-04-04 12:56 ` Andy Parkins
2007-04-04 15:12 ` Linus Torvalds
2007-04-05 5:25 ` Junio C Hamano [this message]
2007-04-05 9:16 ` David Kågedal
2007-04-05 10:24 ` Junio C Hamano
2007-04-05 14:53 ` [PATCH] Document --left-right option to rev-list Brian Gernhardt
2007-04-05 21:37 ` Junio C Hamano
2007-04-07 10:54 ` Alex Riesen
2007-04-09 11:07 ` [PATCH 1/2] git-log --cherry-pick Junio C Hamano
2007-04-10 22:39 ` [PATCH 1/4] Add %m to '--pretty=format:' Junio C Hamano
2007-04-10 22:39 ` [PATCH 2/4] Refactor patch-id filtering out of git-cherry and git-format-patch Junio C Hamano
2007-04-14 8:57 ` Johannes Schindelin
2007-04-10 22:40 ` [PATCH 3/4] git-log --cherry-pick A...B Junio C Hamano
2007-04-10 22:41 ` [PATCH 4/4] Documentation: --cherry-pick Junio C Hamano
2007-04-09 11:11 ` [PATCH 2/2] Add %m to '--pretty=format:' Junio C Hamano
2007-04-11 11:37 ` How can I easily verify my diffs are in parent branch? Alex Bennee
2007-04-11 16:00 ` Linus Torvalds
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=7vircbwfym.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox$(echo .)net \
--cc=git@vger$(echo .)kernel.org \
--cc=kernel-hacker@bennee$(echo .)com \
--cc=torvalds@linux-foundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox