From 5fa7b7181a2c474c6e0b9480d92e34305bca31ed Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Sat, 15 Nov 2014 19:25:29 +0100 Subject: [PATCH] Use cherry-pick -xe instead of git log amend --- admin/notes/git-workflow | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 -- 2.39.5