[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] [emacs] 01/01: Use cherry-pick -xe instead of git log amen
|
From: |
Lars Ingebrigtsen |
|
Subject: |
[Emacs-diffs] [emacs] 01/01: Use cherry-pick -xe instead of git log amend |
|
Date: |
Sat, 15 Nov 2014 18:25:54 +0000 |
larsi pushed a commit to branch master
in repository emacs.
commit 5fa7b7181a2c474c6e0b9480d92e34305bca31ed
Author: Lars Magne Ingebrigtsen <address@hidden>
Date: Sat Nov 15 19:25:29 2014 +0100
Use cherry-pick -xe instead of git log amend
---
admin/notes/git-workflow | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/admin/notes/git-workflow b/admin/notes/git-workflow
index 4bda3f5..798f363 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