[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Marking branch commits not for merge
From: |
Stefan Monnier |
Subject: |
Re: Marking branch commits not for merge |
Date: |
Sun, 15 Feb 2015 14:34:12 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
> gitmerge.el seems to indicate that just having "merge" somewhere in
> the log message is enough, but I think this is designed to catch
> merge-commits.
No, it's designed to catch messages like "Don't merge to trunk",
i.e. exactly your use case.
> So: how do I tell in the commit log message that a commit is not to be
> merged from the release branch onto master?
Somehow put the words "merge" or "backport" in your commit message.
Stefan