From: Junio C Hamano Date: Fri, 13 Feb 2009 07:15:10 GMT Subject: Re: [RFC PATCH] Teach rebase to rebase even if upstream is up to date with -f Message-ID: <7v1vu2g64h.fsf@gitster.siamese.dyndns.org> In-Reply-To: Sverre Rabbelier writes: > On Fri, Feb 13, 2009 at 07:22, Junio C Hamano wrote: > ... >> One more thing.  I kept saying "detect --whitespace=fix (or its synonym >> strip)" because people can have "apply.whitespace = fix" in their >> configuration file for use with "git am", and countermand the >> configuration with "git rebase --whitespace=warn".  Such a usage should >> not imply --force. > > Ok, so having 'apply.whitespace = fix' in your config _should_ imply > -f, and '--whitespace=[no]warn' as commandline option should not > affect '-f'. Well, that is actually not quite what I meant. The intention of the user who runs "git rebase" without an explicit option (-f nor --whitespace) with such a config is ambiguous. But "git rebase --whitespace=fix" *is* unambiguously "I'd like to fix it", with or without a config. It should imply --force. Similarly "git rebase --whitespace=warn" *is* unambiguously "I do not want the rebasing process to touch it, just warn, if necessary". It should not imply --force. So I think it would be the most natural to look only at command line option --whitespace=*, and make fix/strip imply --force, without looking at config.