On Sat, Dec 07, 2013 at 02:38:46AM +0100, Aristotle Pagaltzis wrote:
> * Shlomi Fish <shlo...@shlomifish.org> [2013-12-04 15:30]:
> > Well, "git rebase" did not work properly (too many silly merge commits
> > for stuff that predates my contributions) but a semi-manual "git
> > cherry-pick" appears to have worked well.
> git rebase --onto silug/master d601c5b shlomi/master
> Then a few `git rm -f META.yml && git rebase --continue` later you???d???ve
> gotten what I think is just what???s in your pull request.
Or simpler, turn your commits into a sequence of patches, clone the
author's repo, apply your patches to the clone, issue pull request.
Better IMO than playing git --russian roulette with its powerful but
underdocumented tools for doing unusual stuff.
--
David Cantrell | Nth greatest programmer in the world
Vegetarian: n: a person who, due to malnutrition caused by
poor lifestyle choices, is eight times more likely to
catch TB than a normal person
