Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx> writes: > Junio C Hamano <gitster@xxxxxxxxx> writes: > >> These are not independent (you cannot be in bisect and am at the >> same time). > > You should not, but it seems you can. At least, I just successfully > started a "git am" during a "git bisect". Yeah, that actually is a sensible thing to support (and I am happy to hear it still works). > The variable naming is wrong (it could be s/conflicts/unmerged_present/ > and s/unmerged_state/merge_in_progress/ for example). But these two > variables are indeed independant. You can have unmerged path without an > actual merge in progress (conflicts during "git am"), an you can have a > merge in progress without conflicts (if you've just "git add"-ed them). -- 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