Hi, On Fri, 1 Sep 2006, Sergio Callegari wrote: > > P.S.: Of course, if you do not insist on a super clean history, you can fake > > a merge. Just put <40-hex-chars-old> into .git/MERGE_HEAD and commit. This > > will pretend that your new head and your old head were merged, and the > > result is the new head. This _should_ even work with git-bisect, but it is > > slightly ugly. > > Before I try, can you better explain me what shall go on in this case? > The man page of commit actually does not say much about commit behavior > during a merge (i.e. with MERGE_HEAD set). A merge commit is almost the same as a regulaar commit; the only difference is that you provide multiple parents to a merge commit. The first parent is always the current head. And the other parents are in .git/MERGE_HEAD (one commit SHA1 per line). So, putting the fixed-master SHA1 into .git/MERGE_HEAD pretends that the fixed-master merged with the current master is the current master. >From a view point of correctness, this is _wrong_. _But_ it would work correctly with pull/push/bisect. Ciao, Dscho - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html