From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: A simple git workflow for the rest of us Date: Sat, 15 Nov 2014 20:04:45 +0200 Message-ID: <83vbmge3wi.fsf@gnu.org> References: <8361egfmgg.fsf@gnu.org> <87oas8iclu.fsf@Rainer.invalid> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416074722 18368 80.91.229.3 (15 Nov 2014 18:05:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 18:05:22 +0000 (UTC) Cc: emacs-devel@gnu.org To: Achim Gratz Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 19:05:15 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Xphil-0000U7-3b for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 19:05:15 +0100 Original-Received: from localhost ([::1]:41471 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xphik-0000Aq-NR for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 13:05:14 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57883) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xphic-00007D-C3 for emacs-devel@gnu.org; Sat, 15 Nov 2014 13:05:12 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XphiW-0008VQ-L9 for emacs-devel@gnu.org; Sat, 15 Nov 2014 13:05:06 -0500 Original-Received: from mtaout27.012.net.il ([80.179.55.183]:60821) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XphiW-0008VG-DI for emacs-devel@gnu.org; Sat, 15 Nov 2014 13:05:00 -0500 Original-Received: from conversion-daemon.mtaout27.012.net.il by mtaout27.012.net.il (HyperSendmail v2007.08) id <0NF300F00DT41O00@mtaout27.012.net.il> for emacs-devel@gnu.org; Sat, 15 Nov 2014 20:00:16 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout27.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF300BHGE0GD440@mtaout27.012.net.il>; Sat, 15 Nov 2014 20:00:16 +0200 (IST) In-reply-to: <87oas8iclu.fsf@Rainer.invalid> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.183 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:177217 Archived-At: > From: Achim Gratz > Date: Sat, 15 Nov 2014 18:43:09 +0100 > > Eli Zaretskii writes: > > I think we should decide whether we want to use -x here. > > That would help, and even might make the "Backport:" tag obsolete > (though it's appended to the commit message, so you don't see it in a > shortlog). But this should strictly be used for cherry-picks from > published history only, not local branches. The issue at hand is merging between 2 public branches of the Emacs repository, so that's granted.