Git - 如何从 git diff 生成提交

Question

I am in main branch and there are some mismatches in main and dev . I can see the diff in a specific folder using,

git diff main..dev Code/Folder/*

Now I want to move all the changes the diff showing inside the Code/Folder/* into a new commit in current branch, main.

How do I do that?

Answer 1

You can use git checkout <branch> <path> form like:

git checkout main
git checkout dev Code/Folder
# ... you may fix unwanted changes here ...
git commit -m "import Code/Folder from dev branch"

It will overwrite <path> with <branch> 's content without switching current branch.

Answer 2

Below code works fine (adding changes into main from dev),

git checkout main
git diff main..dev Code/Folder/* | git apply
git add *
git commit -s -m "Adding diffs to main from dev for Code/Folder/*"