Re: A simple git workflow for the rest of us

[Ted Zlatanov]

On Sat, 15 Nov 2014 18:08:12 +0100 Lars Magne Ingebrigtsen <address@hidden> 
wrote: 

>>> cd ~/emacs/emacs-24
>>> git cherry-pick 958b768a6534ae6e77a8547a56fc31b46b63710b
>> 
>> I think we should decide whether we want to use -x here.

LMI>    -x
LMI>            When recording the commit, append a line that says "(cherry 
picked
LMI>            from commit ...)" to the original commit message in order to
LMI>            indicate which commit this change was cherry-picked from.

LMI> Oh, yeah, that seems nice.

Seconded, -x is really helpful.

Ted