From: Junio C Hamano Date: Tue, 22 Jul 2008 08:24:14 GMT Subject: Re: [PATCH] builtin-merge: give a proper error message for invalid strategies in config Message-ID: <7v7ibenx75.fsf@gitster.siamese.dyndns.org> In-Reply-To: <20080722073912.GN32057@genesis.frugalware.org> Miklos Vajna writes: > ... I > would like to send a patch that changes the config parsing as well, so > that pull.twohead "foo bar" would be invalid, and the user would have to > have two pull.twohead entries: one for foo and one for bar. Don't. pull.* has always been defined as "list of strategies", and -s has always been defined to take "a" strategy. IOW, you don't need to break anything further.