From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Sat, 15 Nov 2014 18:25:29 +0000 (+0100)
Subject: Use cherry-pick -xe instead of git log amend
X-Git-Tag: emacs-25.0.90~2635^2~464
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5fa7b7181a2c474c6e0b9480d92e34305bca31ed;p=emacs.git

Use cherry-pick -xe instead of git log amend
---

diff --git a/admin/notes/git-workflow b/admin/notes/git-workflow
index 4bda3f5c909..798f363881f 100644
--- a/admin/notes/git-workflow
+++ b/admin/notes/git-workflow
@@ -59,8 +59,7 @@ which will look like
 commit 958b768a6534ae6e77a8547a56fc31b46b63710b
 
 cd ~/emacs/emacs-24
-git cherry-pick 958b768a6534ae6e77a8547a56fc31b46b63710b
-git commit --amend
+git cherry-pick -xe 958b768a6534ae6e77a8547a56fc31b46b63710b
 
 and add "Backport:" to the commit string.  Then