From: Junio C Hamano Date: Sun, 23 Sep 2007 00:51:29 GMT Subject: Re: [PATCH 4/5] git-merge: add support for --commit Message-ID: <7vir62dx0u.fsf@gitster.siamese.dyndns.org> In-Reply-To: <1190421186-21784-5-git-send-email-hjemli@gmail.com> Lars Hjemli writes: > This option can be used to override --no-commit and --squash. The change > also introduces slightly different behavior for --no-commit: when specified, > it explicitly overrides --squash. Makes me wonder if --no-squash also make sense to override a --squash. Is this really needed? IOW, does it ever make sense to have --no-commit in the configuration?