From: Brent Goodrick <bgoodr@gmail.com>
To: Nanako Shiraishi <nanako3@lavabit.com>
Cc: git@vger.kernel.org
Subject: Re: How do I force git to forget about merging a binary file that is to stay deleted on the target branch?
Date: Sat, 28 Mar 2009 07:29:24 -0700 [thread overview]
Message-ID: <e38bce640903280729u4f582a19ydaa70f619a9911e1@mail.gmail.com> (raw)
In-Reply-To: <20090328192300.6117@nanako3.lavabit.com>
On Sat, Mar 28, 2009 at 3:23 AM, Nanako Shiraishi <nanako3@lavabit.com> wrote:
> I think the standard answer is "you don't".
Thanks, but unfortunately, that won't work for me, since I have too
many commits with useful history that would get lost if I started over
and set up the work and home branches that are branched separately off
of master. Also the "work" fileset and the "home" fileset are 80% the
same; its the 20% that causes me puzzlement each time I want to merge
changes made on one branch onto the other.
bg
next prev parent reply other threads:[~2009-03-28 14:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-28 5:26 How do I force git to forget about merging a binary file that is to stay deleted on the target branch? Brent Goodrick
2009-03-28 10:23 ` Nanako Shiraishi
2009-03-28 14:29 ` Brent Goodrick [this message]
2009-03-28 12:47 ` Elijah Newren
2009-03-28 14:46 ` Brent Goodrick
2009-03-28 15:07 ` Junio C Hamano
2009-03-28 15:21 ` Brent Goodrick
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=e38bce640903280729u4f582a19ydaa70f619a9911e1@mail.gmail.com \
--to=bgoodr@gmail.com \
--cc=git@vger.kernel.org \
--cc=nanako3@lavabit.com \
/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).