From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lars Magne Ingebrigtsen Newsgroups: gmane.emacs.devel Subject: Re: A simple git workflow for the rest of us Date: Sat, 15 Nov 2014 18:08:12 +0100 Message-ID: References: <8361egfmgg.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416071340 32403 80.91.229.3 (15 Nov 2014 17:09:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 17:09:00 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 18:08:54 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 1XpgqD-0000y7-V2 for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 18:08:54 +0100 Original-Received: from localhost ([::1]:41312 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpgqD-00072n-Fs for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 12:08:53 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44883) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpgpv-00072c-V0 for emacs-devel@gnu.org; Sat, 15 Nov 2014 12:08:41 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xpgpq-0008Pv-RN for emacs-devel@gnu.org; Sat, 15 Nov 2014 12:08:35 -0500 Original-Received: from hermes.netfonds.no ([80.91.224.195]:42099) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpgpq-0008Pr-Kq; Sat, 15 Nov 2014 12:08:30 -0500 Original-Received: from cm-84.215.51.58.getinternet.no ([84.215.51.58] helo=stories.gnus.org) by hermes.netfonds.no with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1XpgpY-0007nF-IG; Sat, 15 Nov 2014 18:08:12 +0100 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAHlBMVEUAAAAAAAMFBQ0BAwkA AAS6fXwICA8AAQY2Eh8AAQcETrc+AAACLElEQVQ4jW2TQaucMBDHtS286wrC0muWyuuxpuySWy2B 4AcQPG9pcG/dViq5FpTc80Dm23YmE2UfvCAK+fn/z0wyk2VxHQqtx6J0YSwO+VEGKbNDBLnW5t44 UOpeFK0iwKsw07ROgBtrOQEqTgmUZpwAVwBoDEi1W5VmcmFFKwDtULeBvCxNCy8QCIB8BSYHawTw CLK8+W5p3eB8sp/JK/sWy8ibT7PvfbeA1h9lCLJmgGXg79equsJLcwRMqo5WT7Xd1lWcRgJc4O8q bQ8LvkTMN4I6gcFHUUyYQRJ470liHCQgNgETtqLgu1PXdf1iHYRHIOzz3NFajKN0dythh7jf9SOG EAxIIgQLuu4GW3COkQQIMKvTG6C/QXiV7gNQtXgD+EvYgierFNyTk411kGKwlkFvEdR2L3D2SwRU uSTQICCjrvd+ToAVB1aQ+bxbYYyGwbCDbsE7r7fgHg8We6FnIOXZxnTPP8mCIH0IVDZ2yV/O3/P7 HysKBO9m3pq7GXU/GLxPnTgNlDS1NV1sCk4DovH32TuAF8fgnh94cmIr0By0j4q8OPoEFDBo0uSU LajJKYlTFR4VZenU2rT7eFQ7wJNbtYtjGCL48yWCo8O51DjIrKmr7Cun+zRNsDYmqJUEtRAbKPUR VoxzWUmBXZ7dN2CwN5TCdFsVwaZAF+XwJpSKV26zXww0HoQasQ4sPdTYs5wsPkZCi+nWynH07RA/ OLhcsAwJ1AqY1X/rL0NxGDWE/wAAAABJRU5ErkJggg== X-Now-Playing: Joni Mitchell's _Shadows And Light (1)_: "Amelia" X-Hashcash: 1:23:141115:emacs-devel@gnu.org::D8gE2uWZYc3yU7/b:00000000000000000000000000000000000000000038Zq X-Hashcash: 1:23:141115:eliz@gnu.org::hgDA2QYxRDTe2azD:00000+4h5 In-Reply-To: <8361egfmgg.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 15 Nov 2014 18:38:39 +0200") User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) X-MailScanner-ID: 1XpgpY-0007nF-IG MailScanner-NULL-Check: 1416676092.75964@Q+RyX3/ZpR1/Habn7EoqsQ X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.224.195 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:177209 Archived-At: Eli Zaretskii writes: >> 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. I just wanted a single, simple thing somebody who's unfamiliar with git, and who doesn't care about git, could cut and paste. I always like it when projects have instructions, starting from scratch, in one single place. >> cd ~/emacs/emacs-24 >> git cherry-pick 958b768a6534ae6e77a8547a56fc31b46b63710b > > I think we should decide whether we want to use -x here. -x When recording the commit, append a line that says "(cherry picked from commit ...)" to the original commit message in order to indicate which commit this change was cherry-picked from. Oh, yeah, that seems nice. >> git commit --amend >> >> and add "Backport:" to the commit string. > > Why not use "cherry-pick -e" instead? Yes, that's probably easier. I thought it may confuse the user less if it's done in two steps (first cherry-pick the change, which may or may not work), and then do the commit amendment. But it may be less confusing to do both things in one step... Feel free to amend the document. >"? -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no