diff options
| author | Lars Magne Ingebrigtsen | 2014-11-15 19:25:29 +0100 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2014-11-15 19:25:45 +0100 |
| commit | 5fa7b7181a2c474c6e0b9480d92e34305bca31ed (patch) | |
| tree | c07fac18f96590c79dcc406f92da14cfff61667c /admin/notes/git-workflow | |
| parent | 0d9bf9725af8d819709ab775c380cc6cadddc5b5 (diff) | |
| download | emacs-5fa7b7181a2c474c6e0b9480d92e34305bca31ed.tar.gz emacs-5fa7b7181a2c474c6e0b9480d92e34305bca31ed.zip | |
Use cherry-pick -xe instead of git log amend
Diffstat (limited to 'admin/notes/git-workflow')
| -rw-r--r-- | 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 4bda3f5c909..798f363881f 100644 --- a/admin/notes/git-workflow +++ b/admin/notes/git-workflow | |||
| @@ -59,8 +59,7 @@ which will look like | |||
| 59 | commit 958b768a6534ae6e77a8547a56fc31b46b63710b | 59 | commit 958b768a6534ae6e77a8547a56fc31b46b63710b |
| 60 | 60 | ||
| 61 | cd ~/emacs/emacs-24 | 61 | cd ~/emacs/emacs-24 |
| 62 | git cherry-pick 958b768a6534ae6e77a8547a56fc31b46b63710b | 62 | git cherry-pick -xe 958b768a6534ae6e77a8547a56fc31b46b63710b |
| 63 | git commit --amend | ||
| 64 | 63 | ||
| 65 | and add "Backport:" to the commit string. Then | 64 | and add "Backport:" to the commit string. Then |
| 66 | 65 | ||