From: Jay Soffian <jaysoffian@gmail.com>
To: Daniel Jacobs <djacobs7@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: excluding files from a merge
Date: Sun, 15 Mar 2009 08:47:30 -0400 [thread overview]
Message-ID: <76718490903150547o1c791d35r5d71000b481f443b@mail.gmail.com> (raw)
In-Reply-To: <loom.20090315T011519-497@post.gmane.org>
On Sat, Mar 14, 2009 at 9:23 PM, Daniel Jacobs <djacobs7@gmail.com> wrote:
> I would like it if every file was merged, except for files that were explictly
> excluded from a merge between these two branches. Is there a good way to do
> this?
Please see http://thread.gmane.org/gmane.comp.version-control.git/110488
(Is there a way to exclude user-specified files or directories from
participating in merges?)
I believe it is the same use case, and Junio provided a very detailed reply.
HTH,
j.
next prev parent reply other threads:[~2009-03-15 12:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-15 1:23 excluding files from a merge Daniel Jacobs
2009-03-15 12:47 ` Jay Soffian [this message]
2009-03-15 22:14 ` Nanako Shiraishi
2009-03-16 1:45 ` Jay Soffian
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=76718490903150547o1c791d35r5d71000b481f443b@mail.gmail.com \
--to=jaysoffian@gmail.com \
--cc=djacobs7@gmail.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).