How can I easily verify my diffs are in parent branch?

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Alex Bennee
Date: Wednesday, April 4, 2007 - 4:36 am

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

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
How can I easily verify my diffs are in parent branch?, Alex Bennee, (Wed Apr 4, 4:36 am)
Re: How can I easily verify my diffs are in parent branch?, Junio C Hamano, (Wed Apr 4, 10:25 pm)
[PATCH 1/2] git-log --cherry-pick, Junio C Hamano, (Mon Apr 9, 4:07 am)
[PATCH 2/2] Add %m to '--pretty=format:', Junio C Hamano, (Mon Apr 9, 4:11 am)
[PATCH 1/4] Add %m to '--pretty=format:', Junio C Hamano, (Tue Apr 10, 3:39 pm)
[PATCH 3/4] git-log --cherry-pick A...B, Junio C Hamano, (Tue Apr 10, 3:40 pm)
[PATCH 4/4] Documentation: --cherry-pick, Junio C Hamano, (Tue Apr 10, 3:41 pm)
Re: How can I easily verify my diffs are in parent branch?, Linus Torvalds, (Wed Apr 11, 9:00 am)
Re: [PATCH 2/4] Refactor patch-id filtering out of git-che ..., Johannes Schindelin, (Sat Apr 14, 1:57 am)