> My version of git (git version 1.6.1.2) allows me to checkout with the
> --theirs flag. Perhaps this is what you need to try?
That's what I'm using on the seond last line there (the one with all
the pipes)... checkout --theirs does the checking out, but there's no
option I know of to say checkout "their" version of "all the unmerged"
files (necessitating the pipeline to pass the file names to the
checkout).
Note... I did forget to put a second "get add rdoc" in this workflow
after the checkout --theirs (so that the changes would actually
commit).
Here's my modified workflow... I'm still sure there's an easier way...
> > 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 add rdoc
> > git commit -m "update rdoc" --no-verify
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
