Paolo Bonzini: I found a typo in the documentation: > diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt [...] > +The merge strategy `-s theirs` resolves conflicts in favor of the commits > +being rebased---in this case, you know that the only conflicts will occur > +when replaying E', and you definitely E'' to have those changes. It should say "...you definitely *want* E'' to have..." -- \\// Peter - http://www.softwolves.pp.se/ -- 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
