From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ted Zlatanov Newsgroups: gmane.emacs.devel Subject: Re: A simple git workflow for the rest of us Date: Sat, 15 Nov 2014 21:57:55 -0500 Organization: =?utf-8?B?0KLQtdC+0LTQvtGAINCX0LvQsNGC0LDQvdC+0LI=?= @ Cienfuegos Message-ID: <874mtzn970.fsf@lifelogs.com> References: <8361egfmgg.fsf@gnu.org> Reply-To: emacs-devel@gnu.org NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416106694 16545 80.91.229.3 (16 Nov 2014 02:58:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 16 Nov 2014 02:58:14 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 16 03:58:07 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 1Xpq2P-0000k4-TU for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 03:58:06 +0100 Original-Received: from localhost ([::1]:42622 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpq2P-0003bp-JF for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 21:58:05 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43632) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpq27-0003Wt-F2 for emacs-devel@gnu.org; Sat, 15 Nov 2014 21:57:54 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xpq20-0001zG-KT for emacs-devel@gnu.org; Sat, 15 Nov 2014 21:57:47 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:52516) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpq20-0001z7-DK for emacs-devel@gnu.org; Sat, 15 Nov 2014 21:57:40 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xpq1y-0000bG-Lm for emacs-devel@gnu.org; Sun, 16 Nov 2014 03:57:38 +0100 Original-Received: from c-98-229-61-72.hsd1.ma.comcast.net ([98.229.61.72]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 16 Nov 2014 03:57:38 +0100 Original-Received: from tzz by c-98-229-61-72.hsd1.ma.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 16 Nov 2014 03:57:38 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 17 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: c-98-229-61-72.hsd1.ma.comcast.net X-Face: bd.DQ~'29fIs`T_%O%C\g%6jW)yi[zuz6; d4V0`@y-~$#3P_Ng{@m+e4o<4P'#(_GJQ%TT= D}[Ep*b!\e,fBZ'j_+#"Ps?s2!4H2-Y"sx" Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:TsoHM20qVeYBp8ChxLL3yiM1NRo= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:177267 Archived-At: On Sat, 15 Nov 2014 18:08:12 +0100 Lars Magne Ingebrigtsen wrote: >>> cd ~/emacs/emacs-24 >>> git cherry-pick 958b768a6534ae6e77a8547a56fc31b46b63710b >> >> I think we should decide whether we want to use -x here. LMI> -x LMI> When recording the commit, append a line that says "(cherry picked LMI> from commit ...)" to the original commit message in order to LMI> indicate which commit this change was cherry-picked from. LMI> Oh, yeah, that seems nice. Seconded, -x is really helpful. Ted