From: Dilip M <dilipm79@gmail.com>
To: Neal Kreitzinger <neal@rsss.com>
Cc: git <git@vger.kernel.org>
Subject: Re: force "unmerged" for same-file auto-merges
Date: Sat, 27 Mar 2010 22:52:25 +0530 [thread overview]
Message-ID: <c94f8e121003271022v2b30ef52j3bd4015f12938f7a@mail.gmail.com> (raw)
In-Reply-To: <hoh16f$koe$1@dough.gmane.org>
On Fri, Mar 26, 2010 at 6:34 AM, Neal Kreitzinger <neal@rsss.com> wrote:
> In other words, when two people modify the same file in different places I
> want the automerge results file, but I want the resulting file marked as
> unmerged so the programmer can then run git-mergetool to review the merge
> results. This also prevents the programmer from running git-commit
> immediately after the automerge without reviewing the merge results. Can
> "mark automerge of samefile as 'unmerged'" be done in git via config
> settings or command options?
What about merge with '--no-commit' option and than doing 'diff --cached'. You
have option of still seeing what merged and decide to reset or commit.
--
Dilip
next prev parent reply other threads:[~2010-03-27 17:22 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 [this message]
2010-03-26 19:29 ` Junio C Hamano
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=c94f8e121003271022v2b30ef52j3bd4015f12938f7a@mail.gmail.com \
--to=dilipm79@gmail.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).