Ok so I Have a branch in git that looks like this
A-B-C-D-E
and a branch that looks like this
A-B-F-G
I want to make a branch like this
A-B-D-E-F-G
I think tagging might be involved but I am rather new to git.
Asked
Active
Viewed 616 times
0
-
1Tagging has nothing to do with this, at all. Tagging lets you create symbolic names for commits. – user229044 Dec 05 '12 at 19:19
-
That is a good explanation of tagging and it helps me understand. Thank you – MrBrightside Dec 05 '12 at 20:47
2 Answers
8
You may want to create a new branch, starting at commit B, and then cherry-pick the specific commits you're interested in onto your new branch.
git checkout my-branch <B-commit-id>
git cherry-pick <D-commit-id>
git cherry-pick <E-commit-id>
git cherry-pick <F-commit-id>
git cherry-pick <G-commit-id>
user229044
- 232,980
- 40
- 330
- 338
-
so cherry-pick adds on a single commit?(also git checkout my-branch is missing an n) – MrBrightside Dec 05 '12 at 20:49
-
Yes, cherry-pick copies a single commit by its ID into your current branch. – user229044 Dec 05 '12 at 21:09
-
1@ellotheth They're disjoint, from different branches. You could at best use `D..E` and `F..G`. – user229044 Dec 06 '12 at 13:25
0
You may want to do a rebase on the other branch and an interactive rebase on commit B.
branchE points to Commit E. branchG points to Commit G
git checkout branchG
git rebase branchE
git rebase -i <B-commit-id>
Remove the complete line of C-Commit-Id. Save and close the editor. Finished.
Please read the help messages in the editor. It explains the possibilities of interactive rebase.
fernsehkind
- 51
- 5