[git-users] How do I find the branch of each parent of a merge commit?

2014-03-28 Thread Alex Rodrigues
I would like to find the branches that contributed to a commit that was the result of a merge. If I am able to find the SHASUM of each of the versions that contributed to the merge (i.e. the parents), how can I get the branch of each of the parents? Note that the merge could have been done from

Re: [git-users] How do I find the branch of each parent of a merge commit?

2014-03-31 Thread Alex Rodrigues
Perhaps I should explain what I am trying to do. We have several project branches where developers commit their code (A project is a set of related features). The project branches are frequently merged to an integration branch where the code is compiled and then deployed from. (1 integration

Re: [git-users] How do I find the branch of each parent of a merge commit?

2014-04-01 Thread Alex Rodrigues
Thanks . wanted to make sure there was not already some simple command to get what I wanted, and it appears there isn't. Thanks for the links, seems to be some promising leads there which help me get to where I want to go. -- You received this message because you are subscribed to the

Re: [git-users] How do I find the branch of each parent of a merge commit?

2014-04-01 Thread Alex Rodrigues
Also found http://stackoverflow.com/questions/2706797/finding-what-branch-a-commit-came-from the following command appears to be exactly what I need git reflog show --all | grep SHA1 Now I would need to just parse out the branch name :-) -- You received this message because you are

[git-users] Change branch creation point of a topic branch after it has been created?

2014-04-08 Thread Alex Rodrigues
I have a git repository with a master branch and a topic branch (created at master'B) and the topic branch has received some merges from master. A - B - D - F - H- master branch \ \ C - E - G - topic branch Is it possible to changed the point on master

[git-users] Looking for suggestions on git workflows

2014-04-08 Thread Alex Rodrigues
Like some other folks here, I am relatively new to git and am trying to figure out a good workflow for our development team, and appreciate any thoughts suggestions. We have several project teams that require to work in isolation on their respective branches. (a project here consists of a set

Re: [git-users] Change branch creation point of a topic branch after it has been created?

2014-04-08 Thread Alex Rodrigues
for *git rebase temp-branch*, did you actually mean #Reapply your commits *from* your temp branch? Someone in my org just suggested the same kind of solution, so am definitely going to explore that option. But as you rightly mentioned, a rebase can be dangerous and might be so in this