Ximin Luo wrote:
> I've merged everything from Bombe, nextgens, saces.
saces said his fork had some issues and it's too complex for me to deal with
right this minute so i've reverted that merge (ManifestPutter).
According to git-revert(1):
-m parent-number, --mainline parent-number
Usually you cannot revert a merge because you do not know which
side of the merge should be considered the mainline. This option
specifies the parent number (starting from 1) of the mainline and
allows revert to reverse the change relative to the specified
parent.
Reverting a merge commit declares that you will never want the tree
changes brought in by the merge. As a result, later merges will
only bring in tree changes introduced by commits that are not
ancestors of the previously reverted merge. This may or may not be
what you want.
See the revert-a-faulty-merge How-To[1] for more details.
The reference points to /usr/share/doc/git-doc/howto/revert-a-faulty-merge.txt
which is a series of emails between Linus and a bunch of other people. It was
too long to read, so i've just rewound the history back by 1 commit. No-one had
committed on top of it, and i don't think anyone would have pulled in the short
period of time that it was on github.
If you have; sorry. You can verify that I haven't done anything dodgy by
refusing the forced update, checking that commit
798fd8f6c0c9fca49521d851fd8557bae0235059 is in your git log, then allowing the
forced update, and checking that that commit is still there.
X
