From: Mike Strauch <mike.strauch@hannonhill.com>
To: git@vger.kernel.org
Subject: Ignoring commits when merging
Date: Tue, 17 Aug 2010 16:21:01 -0400 [thread overview]
Message-ID: <AANLkTi=B9gsroJS_6SRqa2CLQOed2UguxN7KiFtFWL8t@mail.gmail.com> (raw)
Hi,
I'm fairly new to git and I'm trying to figure out the best way to
ignore certain commits when merging one branch into another. I've
found a solution that suggests that I merge everything before the
commit I want to skip, then merge the commit I want to skip using the
"ours" merging strategy, then merge everything after the skipped
commit. This sounds like an adequate solution to the problem, but I'm
wondering if there's a better way to do it.
I was thinking that I could just cherry-pick the few commits that I
want from Branch 2 in order to exclude the commit I don't want, but
this will result in there being no link between the branches for those
commits. Are there any other ways this can be done?
--
Mike Strauch
www.hannonhill.com
next reply other threads:[~2010-08-17 20:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-17 20:21 Mike Strauch [this message]
2010-08-18 1:59 ` Ignoring commits when merging Jonathan Nieder
2010-08-18 18:08 ` Mike Strauch
2010-08-18 23:38 ` Jonathan Nieder
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='AANLkTi=B9gsroJS_6SRqa2CLQOed2UguxN7KiFtFWL8t@mail.gmail.com' \
--to=mike.strauch@hannonhill.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).