Hi Junio, On Tue, 26 Apr 2016, Junio C Hamano wrote:
> It is true that we do not make a commit when we are asked to do > "merge --squash", and the code does so by setting option_commit > variable to zero when seeing the squash option. But this made it > impossible to see from the value of option_commit if --no-commit was > given from the command line, or --squash turned it off. > > We check for the value of option_commit at only two places. Check > for the value of squash at them, too. > > Signed-off-by: Junio C Hamano <gits...@pobox.com> > --- > > * Just a preliminary clean-up for the next one which is on topic. I think it would make for a nice cleanup anyways. Ciao, Dscho -- 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
