From: Caleb Cushing <xenoterracide@gmail.com>
To: git@vger.kernel.org
Subject: mergetool ignore
Date: Fri, 16 Jan 2009 15:19:30 -0500 [thread overview]
Message-ID: <81bfc67a0901161219l23877df8xf1707aaf9e83bcb3@mail.gmail.com> (raw)
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
reply other threads:[~2009-01-16 20:20 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=81bfc67a0901161219l23877df8xf1707aaf9e83bcb3@mail.gmail.com \
--to=xenoterracide@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).