Here's what I've come up with...
I added the following alias to my ~/.gitconfig...
[alias]
unmerge-theirs = "!f() { git ls-files --unmerged | cut -f2 |
sort -u ; }; git checkout --theirs `f`; git add `f`"
Then I can...
git checkout master
rake rdoc
git add rdoc
git checkout -m gh-pages
git unmerge-theirs
git commit --no-verify -m "updated rdoc"
Obviously, the whole series of events could be put into a rake task or
integrated into github-gem, but that's an exercise for another day.
If anyone has any better ideas for this process, I'm still interested,
but for now I can at least get things done.
Cheers.
--Brent
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
