Re: [PATCH] pull: require choice between rebase/merge on non-fast-forward pull
- From
Fredrik Gustafsson <iveqy@iveqy.com>
- Date
- Jun 27, 2013, 20:11 UTC
- Message-ID
- <20130627201142.GC27497@paksenarrion.iveqy.com>
- In-Reply-To
- <7v4ncjs5az.fsf_-_@alter.siamese.dyndns.org>
On Thu, Jun 27, 2013 at 12:48:52PM -0700, Junio C Hamano wrote: <snip>
Show 5 quoted lines
> +# See if we are configured to rebase by default. > +# The value $rebase is, throughout the main part of the code: > +# (empty) - the user did not have any preference > +# true - the user told us to integrate by rebasing > +# flase - the user told us to integrate by merging
s/flase/false
And isn't all config settings documented somewhere?
-- Med vänliga hälsningar Fredrik Gustafsson tel: 0733-608274 e-post: iveqy@iveqy.com