Reputation: 1657
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.
Upvotes: 66
Views: 48256
Reputation: 11
Also may do cherry-pick from master to gh-pages after commit foo.(After cherry-pick must execute git add [path to foo] and commit)
Upvotes: -1
Reputation: 41022
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
Upvotes: 2
Reputation: 8819
You can:
git checkout gh-pages
git checkout master foo
git commit -m 'Add file foo to gh-pages.'
Upvotes: 98
Reputation: 1010
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
Upvotes: -1