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 18:38:39 +0200 Message-ID: <8361egfmgg.fsf@gnu.org> References: Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416069568 5934 80.91.229.3 (15 Nov 2014 16:39:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 16:39:28 +0000 (UTC) Cc: emacs-devel@gnu.org To: Lars Magne Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 17:39:22 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 1XpgNd-0000e4-6K for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 17:39:21 +0100 Original-Received: from localhost ([::1]:41069 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpgNc-0004Uj-Oq for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 11:39:20 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38934) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpgNK-0004UV-Jd for emacs-devel@gnu.org; Sat, 15 Nov 2014 11:39:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpgNE-00079h-1d for emacs-devel@gnu.org; Sat, 15 Nov 2014 11:39:02 -0500 Original-Received: from mtaout24.012.net.il ([80.179.55.180]:54953) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpgND-00079d-Q5 for emacs-devel@gnu.org; Sat, 15 Nov 2014 11:38:55 -0500 Original-Received: from conversion-daemon.mtaout24.012.net.il by mtaout24.012.net.il (HyperSendmail v2007.08) id <0NF300K009W34O00@mtaout24.012.net.il> for emacs-devel@gnu.org; Sat, 15 Nov 2014 18:31:21 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout24.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF300HW09W94Q20@mtaout24.012.net.il>; Sat, 15 Nov 2014 18:31:21 +0200 (IST) In-reply-to: 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.180 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:177203 Archived-At: > From: Lars Magne Ingebrigtsen > Date: Sat, 15 Nov 2014 17:09:59 +0100 > > Setting up and using git for normal, simple bugfixing > ===================================================== > > If you haven't configured git before you should first do: > > git config --global user.name "Frank Chu" > git config --global user.email "fchu@example.com" > > Initial setup > ============= > > Then we want to clone the repository. We normally want to have both > the current trunk and the emacs-24 branch. > > mkdir ~/emacs > cd ~/emacs > git clone @git.sv.gnu.org:/srv/git/emacs.git > mv emacs trunk > ./trunk/admin/git-new-workdir trunk emacs-24 > cd emacs-24 > git checkout emacs-24 I don't think these 2 sections should be in the document. If you like, we can add a reference to the Wiki here, which explains this in more detail. > cd ~/emacs/emacs-24 > git cherry-pick 958b768a6534ae6e77a8547a56fc31b46b63710b I think we should decide whether we want to use -x here. > git commit --amend > > and add "Backport:" to the commit string. Why not use "cherry-pick -e" instead?