From: Troy Telford <ttelford.groups@gmail.com>
Date: Thu, 25 Jan 2007 17:17:13 GMT
Subject: Per-file force update
Message-ID: <op.tmpzmzvtzidtg1@rygel.lnxi.com>

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?

Thanks,
-- 
Troy Telford