From: "Shawn O. Pearce" <spearce@spearce.org>
To: Troy Telford <ttelford.groups@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Per-file force update
Date: Thu, 25 Jan 2007 12:22:26 -0500 [thread overview]
Message-ID: <20070125172226.GB13089@spearce.org> (raw)
In-Reply-To: <op.tmpzmzvtzidtg1@rygel.lnxi.com>
Troy Telford <ttelford.groups@gmail.com> wrote:
> I've got a file that (due to some inner workings) changes whenever it's
> built.
>
> This causes a problem with git, causing merge conflicts.
>
> Is there a way I can configure git to /always/ do the equivalent of 'git
> pull -f', but only for that one file?
Take the file out of the repository. If its being rebuilt everytime
you build, why are you tracking it in Git?
Git is for tracking *sources*. That file sounds like its an output,
which shouldn't be tracked.
--
Shawn.
next prev parent reply other threads:[~2007-01-25 17:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-25 17:17 Per-file force update Troy Telford
2007-01-25 17:22 ` Shawn O. Pearce [this message]
2007-01-26 13:02 ` Jakub Narebski
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=20070125172226.GB13089@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=ttelford.groups@gmail.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