From: Stephen Bash <bash@genarts.com>
To: git@vger.kernel.org
Subject: Maint-only commits
Date: Mon, 16 May 2011 17:15:26 -0400 (EDT) [thread overview]
Message-ID: <6416457.30612.1305580526325.JavaMail.root@mail.hq.genarts.com> (raw)
In-Reply-To: <10397477.30610.1305580263246.JavaMail.root@mail.hq.genarts.com>
Hi all-
In my office we've recently run into three separate fixes required on our maintenance branch that should not be included in master (our normal workflow is to make changes on maint, tag, release, and then merge to master). Normally these "maint only" fixes are interspersed with commits that should go back into master. In the past the "maint only" commits were rare, so I'd carefully use "merge -s ours" to avoid including the "maint only" changes in master. But now I'm wondering if there's a better process/workflow? Certainly a well crafted alias or custom command makes the user's life easier, but still clutters master with "extra" merges.
Any thoughts? Thanks!
Stephen
next parent reply other threads:[~2011-05-16 21:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <10397477.30610.1305580263246.JavaMail.root@mail.hq.genarts.com>
2011-05-16 21:15 ` Stephen Bash [this message]
2011-05-16 22:05 ` Maint-only commits Junio C Hamano
2011-05-17 14:20 ` Stephen Bash
2011-05-17 15:13 ` Jay Soffian
2011-09-18 19:11 ` Enrico Weigelt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6416457.30612.1305580526325.JavaMail.root@mail.hq.genarts.com \
--to=bash@genarts.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).