如何使用 git 将文件从一个分支复制到另一个分支？

Question

I have a git repository with two branches: master and gh-pages . If I want to copy a file foo from master to gh-pages without merging them. What command should I use? Many thanks.

Answer 1

You can:

git checkout gh-pages
git checkout master foo
git commit -m 'Add file foo to gh-pages.'

Answer 2

If you want to compare all the diffs between 2 branches: you can use git difftool master gh-pages or git difftool <SHA1 of gh-pages> .

If you want to get diff for specific list of files follow this :

git diff master gh-pages -- path/to/file

Answer 3

也可以在提交foo后从master到gh-pages进行cherry-pick。（在cherry-pick 之后必须执行git add [path to foo]并提交）

Answer 4

The Way I would do it: When you commit you have a choice of what to commit and push. So commit only foo from master then push it, Then just merge that on github/bitbucket whatever to gh-pages