New Git branch with diff of 2 others

Question

I want to create a branch in GIT with the file differences from 2 other git branches. I do not want whole repo copy but only the changed files keeping rest of the folder structure as is. How can I achieve this?

For example:

Branch 1: testbranch1

deployment/src/main/apiproxy/myorg/folder1/file1.txt
deployment/src/main/apiproxy/myorg/folder1/file2.txt
deployment/src/main/apiproxy/myorg/folder2/file1.txt
deployment/src/main/apiproxy/myorg/folder2/file2.txt

Branch 2: testbranch2

deployment/src/main/apiproxy/myorg/folder1/file1.txt -> File Changed
deployment/src/main/apiproxy/myorg/folder1/file2.txt
deployment/src/main/apiproxy/myorg/folder2/file1.txt
deployment/src/main/apiproxy/myorg/folder2/file2.txt -> File Changed

New branch should have:

deployment/src/main/apiproxy/myorg/folder1/file1.txt
deployment/src/main/apiproxy/myorg/folder2/file2.txt

I'm having trouble understanding what you mean. Could you [edit] your question and provide an example, possibly as a [mcve]? — ChrisGPT was on strike, Sep 20 '17 at 15:13
May be `git rebase --onto` ?! https://stackoverflow.com/questions/29315281/merge-diff-between-two-branches-to-third-branch — Srini V, Sep 20 '17 at 15:14

score 0 · Answer 1 · answered Sep 20 '17 at 15:56

0

Instead of creating a new branch, You can just create a patch for the changes.

git format-patch testbranch2 --stdout > mypatch.patch

Later if you need to apply your patch, do the following.

git apply mypatch.patch

answered Sep 20 '17 at 15:56

Md. Al-Amin

1,423
1
13
26

Thanks. I need a branch to put in Bamboo plan So that maven can build and deploy from that. Can this patch be applied to a branch? – Tarun Sep 20 '17 at 15:57
If the testbranch2 to contain latest changes, why don't you use that branch? can you explain? – Md. Al-Amin Sep 20 '17 at 15:59
Yes. You need to checkout to the specific branch to apply the patch. – Md. Al-Amin Sep 20 '17 at 16:00
I can't use testbranch2 because it will deploy all files and not only the changed files. – Tarun Sep 20 '17 at 16:02
I guess you can create a build step to apply the patch? – Md. Al-Amin Sep 20 '17 at 16:04
Would be great if you can help me how to do that in bamboo – Tarun Sep 20 '17 at 16:08

New Git branch with diff of 2 others

1 Answers1