* mergetool ignore
@ 2009-01-16 20:19 Caleb Cushing
0 siblings, 0 replies; only message in thread
From: Caleb Cushing @ 2009-01-16 20:19 UTC (permalink / raw)
To: git
is there any way to tell git to ignore merging certain files? I've got
files that have the same name in each directory. but I can't merge
them with an editor... it'd be easier to be able to ignore them with
git mergetool... and handle them manually.
--
Caleb Cushing
http://xenoterracide.blogspot.com
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-01-16 20:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-16 20:19 mergetool ignore Caleb Cushing
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).