rebase

Suppose I have the following scenario: o (master) / o--o (WIP1) / / o--o--o--o--o--o (WIP2) (X) \ o--o (WIP3) Is there a git command which creates a new branch so that it contains the subtree after branch X? I want to perform a "large rebase", I want the three WIP branches rebased on master. I know I can do that with some Bash scripting but I'd like to know how to do that using a git command. There is no single git command for that. You will have to do some manual work. In your situation: o (master) / o--o (WIP1) / / X--o--o--B--o--o (WIP2) \ o--o (WIP3) You first rebase WIP1 onto master: git

I know the thread which says that rebase is for small changes of teamMates, while merge for large changes. I keep three Gits of three teammates in the following directory structure where we all have the same initial code: project | - I | - myTeamMate1 | - myTeamMate2 The branches are not in the same Git. This means that I cannot use rebase and merge. I have used vimdiff to sync changes between teamMates. However, this is time-consuming. I have unsuccessfully tried to make the following directory structure where all branches are under one Git: project | - I - myTeamMate1 - myTeamMate2 However,

I have the following situation: I made some commits to my local repository, and then a huge merge of another branch (~150 commits) into the master - it had a lot of conflicts in it. Now, I want to move a commit I made before the merge to be after it before pushing. Normally, I would use "rebase -i" for it. Unfortunately, the default behavior is to break the one-merge-commit I did that actually added 150 more commits to master into separate commits (I understand it's like if I would use rebase instead of merge to begin with) - which is bad behavior for me for several reasons. I discovered the '

When I run 'git gui' I get a popup that says This repository currently has approximately 1500 loose objects. It then suggests compressing the database. I've done this before, and it reduces the loose objects to about 250, but that doesn't suppress the popup. Compressing again doesn't change the number of loose objects. Our current workflow requires significant use of 'rebase' as we are transitioning from Perforce, and Perforce is still the canonical SCM. Once Git is the canonical SCM, we will do regular merges, and the loose objects problem should be greatly mitigated. In the mean time, I'd

I have the following situation: I created a clone (Y) from a main repository(X), because there were many people working on Y we didn't do any rebase but only merge s. When we want to deliver( push ) Y to X we would like to do a rebase in order to have things nice and clean The problem is that when doing rebase we are asked to do all the merges that we already did in the previous merge steps. Is there a solution to this, beside the one that means actually re-doing the merges? I expected it to be pretty straightforward since we already solved the conflicting merges. Rebasing to get a "clean"