From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-30879-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 3519 invoked by alias); 13 Dec 2012 15:38:11 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 30879
Received: (qmail 1433 invoked from network); 13 Dec 2012 15:38:09 -0000
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE
	autolearn=ham version=3.3.2
Received-SPF: none (ns1.primenet.com.au: domain at closedmail.com does not designate permitted sender hosts)
From: Bart Schaefer <schaefer@brasslantern.com>
Message-id: <121213073746.ZM29381@torch.brasslantern.com>
Date: Thu, 13 Dec 2012 07:37:46 -0800
In-reply-to: <12941.1355403532@thecus.kiddle.eu>
Comments: In reply to Oliver Kiddle <okiddle@yahoo.co.uk>
 "Re: Access to CVS" (Dec 13,  1:58pm)
References:
 <CACeGjnXQv0kBEyRX7neH_dWszDc6NzKSP7Qi9_PEDeZkvKYtGA@mail.gmail.com>
	<20121204225059.GA9935@redoubt.spodhuis.org>
	<26711.1354667636@thecus.kiddle.eu>
	<20121205031447.GA26262@redoubt.spodhuis.org>
	<121205014000.ZM22819@torch.brasslantern.com>
	<20121205112647.GA34241@redoubt.spodhuis.org>
	<20121205195013.64ef36c0@pws-pc.ntlworld.com>
	<20121207000521.GD20703@pug.qqx.org>
	<20121207094935.0d9bce83@pwslap01u.europe.root.pri>
	<4810.1355267148@thecus.kiddle.eu>	<87a9tjwuec.fsf@ft.bewatermyfriend.org>
	<8272.1355333127@thecus.kiddle.eu>
	<121212105719.ZM28299@torch.brasslantern.com>
	<12941.1355403532@thecus.kiddle.eu>
X-Mailer: OpenZMail Classic (0.9.2 24April2005)
To: zsh-workers@zsh.org
Subject: Re: Access to CVS
MIME-version: 1.0
Content-type: text/plain; charset=us-ascii

On Dec 13,  1:58pm, Oliver Kiddle wrote:
}
} +* Do not merge your private feature branches onto the master branch: a
} +  linear history without merge commits is simpler to follow (and to
} +  bisect). Both "git cherry-pick" and "git merge --ff-only" can be used
} +  bring changes over to another branch without a merge commit.

Is there any way to actually enforce this?  How does one "recover" from
an accidental merge commit?