Yes, I am aware that branching is different in git than what I have used so far with SVN. But apart from the implementation, I have some information that I want to gather about work done on a branch. Here are a few questions/scenarios that I want to make sure we can handle. Remember that our branches are mapped one to one to a Jira ticket. 1. show all code changes performed on a branch (for code review) 2. show list of files/directories touched by a branch (useful when looking for past fixes, but are unsure where the fix was done) So far I have not found the exact syntax to get this information, but am convinced that git can provide it! -Harry -----Original Message----- From: Alex Riesen [mailto:raa.lkml@xxxxxxxxx] Sent: Tuesday, June 09, 2009 2:50 PM To: Harry Duin Cc: git@xxxxxxxxxxxxxxx Subject: Re: branch management Harry Duin, Tue, Jun 09, 2009 19:35:24 +0200: > My questions are on branch management. You seem to think about branches as they are in CVS or SVN (just directories with in-system metadata). You'll find the Git's branching different (being more about history, not at all about directory structure). > 1. We have different repos for doing the integration merging. In > addition to that we have a golden repos, containing what is in > production. The branch history gets pushed by developers to the > integration repos, but not to the golden repos. Since our integration > repos are created for each integration, this means I have lost my > branch history when an integration repos gets deleted.. No. As long as there is something, basing its history on the history of the integration repos (and I assume that your "golden", aka "release" or "maintenance" elsewhere, do just that) the history is there. Forever. As it is on every developers machine with a distributed VCS. > 2. What command do I use to display only the list of files updated by/for a > branch? Do you mean the files changed since the branch (presumably "development") diverged from some other branch (presumably "golden")? What for? > This means I want to exclude files that were merged in from say > master - these files are not part of the branch development. You better not exclude files (and while at it, stop thinking about files when working with _history_). Try describing the problem on _change_ (aka "commit", or point in time or history) level. P.S. Your (re?)mailer seems to be broken. This mail is not very correct base64 and gmail does not even decode it. _______________________________________________________ www.peak6.com The information in this email or in any file attached hereto is intended only for the personal and confiden- tial use of the individual or entity to which it is addressed and may contain information that is propri- etary and confidential. If you are not the intended recipient of this message you are hereby notified that any review, dissemination, distribution or copying of this message is strictly prohibited. This communica- tion is for information purposes only and should not be regarded as an offer to sell or as a solicitation of an offer to buy any financial product. Email trans- mission cannot be guaranteed to be secure or error- free. P6070214 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html