git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
ABAlex Bennee <kernel-hacker@bennee.com>
Date
Apr 4, 2007, 11:36 UTC
Message-ID
<1175686583.19898.68.camel@okra.transitives.com>
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: Alex Riesen
Message 1 of 19 in “How can I easily verify my diffs are in parent branch?”
  1. Alex BenneeApr 4, 2007
  2. Alex RiesenApr 4, 2007
  3. Andy ParkinsApr 4, 2007
  4. Linus TorvaldsApr 4, 2007
  5. Junio C HamanoApr 5, 2007
  6. David KågedalApr 5, 2007
  7. Junio C HamanoApr 5, 2007
  8. Document --left-right option to rev-list.Brian Gernhardt, Apr 5, 2007
  9. Junio C HamanoApr 5, 2007
  10. Alex RiesenApr 7, 2007
  11. 1/2 git-log --cherry-pickJunio C Hamano, Apr 9, 2007
  12. 1/4 Add %m to '--pretty=format:'Junio C Hamano, Apr 10, 2007
  13. 2/4 Refactor patch-id filtering out of git-cherry and git-format-patch.Junio C Hamano, Apr 10, 2007
  14. Johannes SchindelinApr 14, 2007
  15. 3/4 git-log --cherry-pick A...BJunio C Hamano, Apr 10, 2007
  16. 4/4 Documentation: --cherry-pickJunio C Hamano, Apr 10, 2007
  17. 2/2 Add %m to '--pretty=format:'Junio C Hamano, Apr 9, 2007
  18. Alex BenneeApr 11, 2007
  19. Linus TorvaldsApr 11, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.