From: W. Trevor King Date: Fri, 28 Jun 2013 01:08:39 GMT Subject: Re: [PATCH] pull: require choice between rebase/merge on non-fast-forward pull Message-ID: <20130628010839.GC11985@odin.tremily.us> In-Reply-To: <7vehbnqmhh.fsf@alter.siamese.dyndns.org> On Thu, Jun 27, 2013 at 02:20:42PM -0700, Junio C Hamano wrote: > Your "accident user" could have just been on a 'maint' branch, > [snip] By the time I talk people into using a 'maint' branch, we'll probably have already passed the 'accidental pull and push' stage ;). This will certainly reduce the risk in any case. Cheers, Trevor -- This email may be signed or encrypted with GnuPG (http://www.gnupg.org). For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy