Re: A simple git workflow for the rest of us

[Eli Zaretskii]

> From: Achim Gratz <address@hidden>
> Date: Sat, 15 Nov 2014 18:43:09 +0100
> 
> Eli Zaretskii writes:
> > I think we should decide whether we want to use -x here.
> 
> That would help, and even might make the "Backport:" tag obsolete
> (though it's appended to the commit message, so you don't see it in a
> shortlog).  But this should strictly be used for cherry-picks from
> published history only, not local branches.

The issue at hand is merging between 2 public branches of the Emacs
repository, so that's granted.