airflow-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Maxime Beauchemin <maximebeauche...@gmail.com>
Subject Re: Use -x when cherry-picking to v1-10 branches
Date Mon, 22 Apr 2019 20:34:19 GMT
Always, always use `-x` when cherry-picking!

On Mon, Apr 22, 2019 at 1:28 PM Jarek Potiuk <Jarek.Potiuk@polidea.com>
wrote:

> Hello Everyone (committers especially).
>
> I have a proposal to improve slightly the cherry-picking process between
> master and v1-10-branches: We could use `-x` flag when cherry-picking. This
> will automatically record the original commit hash. Can we agree on that
> between committers :)?
>
> J.
>
> Here is the description from Git help:
>
>  -x       When recording the commit, append a line that says "(cherry
> picked from commit ...)" to the original commit message in order to
> indicate which commit this change was cherry-picked from. This is done only
> for cherry picks without conflicts. Do not use this option if you are
> cherry-picking from your private branch because the information is useless
> to the recipient. If on the other hand you are cherry-picking between two
> publicly visible branches (e.g.backporting a fix to a maintenance branch
> for an older release from a development branch), adding this information
> can be useful.
>
> --
>
> Jarek Potiuk
> Polidea <https://www.polidea.com/> | Principal Software Engineer
>
> M: +48 660 796 129 <+48660796129>
> E: jarek.potiuk@polidea.com
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message