okay... how about this?
git checkout master
rake rdoc
git add rdoc
git checkout -m gh-pages
git ls-files -u | awk '{ print $4 }' | sort | uniq | xargs git
checkout --theirs
git commit -m "update rdoc" --no-verify
is there a git built-in way of doing the equivalent of the "ls-
files ... | ... git checkout --theirs"?
ie. overwrite all unmerged with the version from the merged (master)
branch
Anyone?
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"GitHub" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/github?hl=en
-~----------~----~----~----~------~----~------~--~---
