Matthieu Moy wrote:
Andreas Ericsson <ae@xxxxxx> writes:
or check which merge- conflicts you've already resolved,
At least bzr and baz have this kind of conflict management. It's just
a separate file, containing the list of unresolved conflicts.
Can you check them against any revision you want? If so, I'm
impressed :)
If you mean s/check/diff/, not in a simple way, no. Otherwise, I don't
understand what you mean by "check merge-conflicts you've already
resolved against any revision".
Actually, I meant "diff the staged area against any random commit". It's
really nice to do after a bisect, where you know what the bad commit looks
like, and how the code changed to introduce the bug.
--
Andreas Ericsson andreas.ericsson@xxxxxx
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
-
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
