From: Alex Bennee <kernel-hacker@bennee.com>
To: git@vger.kernel.org
Subject: How can I easily verify my diffs are in parent branch?
Date: Wed, 04 Apr 2007 12:36:23 +0100 [thread overview]
Message-ID: <1175686583.19898.68.camel@okra.transitives.com> (raw)
Hi,
This is not the case of looking through the logs for my commit as I'm
exporting my changes from my tree into the company system through CVS.
This means all the usual commit tracking benefits are lost.
So I have a master branch which tracks this master baseline from CVS and
each release I import a big change set which includes all the fixes that
went into that baseline.
What I need to do is check that my commits that I submitted for the
baseline have been correctly merged. Of course if I do "git-diff
master..mywork" I'll see all the other code that has been added in (or
more usually is missing from my branch).
Is there an invocation of git-diff or another tool that can tell me all
my diffs are present in the big uber-commit of my master branch baseline
release?
--
Alex, homepage: http://www.bennee.com/~alex/
Any excuse will serve a tyrant. -- Aesop
next reply other threads:[~2007-04-04 12:01 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-04 11:36 Alex Bennee [this message]
2007-04-04 12:28 ` How can I easily verify my diffs are in parent branch? Alex Riesen
2007-04-04 12:56 ` Andy Parkins
2007-04-04 15:12 ` Linus Torvalds
2007-04-05 5:25 ` Junio C Hamano
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=1175686583.19898.68.camel@okra.transitives.com \
--to=kernel-hacker@bennee.com \
--cc=git@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).