Matthieu Moy <matthieu....@grenoble-inp.fr> writes: > Stephen Kelly <steve...@gmail.com> writes: > >> Galan Rémi <remi.galan-alfonso <at> ensimag.grenoble-inp.fr> writes: >> >>> >>> Check if commits were removed (i.e. a line was deleted) or dupplicated >>> (e.g. the same commit is picked twice), can print warnings or abort >>> git rebase according to the value of the configuration variable >>> rebase.checkLevel. >> >> I sometimes duplicate commits deliberately if I want to split a commit in >> two. I move a copy up and fix the conflict, and I know that I'll still get >> the right thing later even if I make a mistake with the conflict >> resolution. > > The more I think about it, the more I think we should either not warn at > all on duplicate commits, or have a separate config variable.
Yeah, I'd say we shouldn't warn, without configuration to keep things simple. > > It's rare to duplicate by mistake, and when you do so, it's already easy > to notice: you get conflicts, and you can git rebase --skip the second > occurence. Accidentally dropped commits are another story: it's rather > easy to cut-and-forget-to-paste, and the consequence currently is silent > data loss ... -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
