From: Junio C Hamano <gitster@pobox.com>
To: "Neal Kreitzinger" <neal@rsss.com>
Cc: git@vger.kernel.org
Subject: Re: force "unmerged" for same-file auto-merges
Date: Fri, 26 Mar 2010 12:29:16 -0700 [thread overview]
Message-ID: <7vtys2lw4z.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <hobqoc$5h3$1@dough.gmane.org> (Neal Kreitzinger's message of "Tue\, 23 Mar 2010 20\:44\:05 -0500")
"Neal Kreitzinger" <neal@rsss.com> writes:
> Does anyone know if there are configuration and/or command-line options in
> git that can accomplish this in a fairly straightforward manner?
I know there isn't.
Essentially what you are asking for is
read-tree -m -u --trivial O A B
followed by no file-level automerge. I think you can write a custom merge
strategy, perhaps using "resolve" as a template, to do that.
In practice, you will get too many false "conflicts" with such a strategy
and the quality of your "review" would degrade from fatigue, I suspect.
next prev parent reply other threads:[~2010-03-26 19:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-24 1:44 force "unmerged" for same-file auto-merges Neal Kreitzinger
2010-03-26 1:04 ` Neal Kreitzinger
2010-03-27 17:22 ` Dilip M
2010-03-26 19:29 ` Junio C Hamano [this message]
2010-03-27 8:56 ` Sitaram Chamarty
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=7vtys2lw4z.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=neal@rsss.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).