From: Luben Tuikov <ltuikov@yahoo.com>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] git-revert with conflicts to behave as git-merge with conflicts
Date: Thu, 12 Oct 2006 17:31:20 -0700 (PDT) [thread overview]
Message-ID: <20061013003120.98769.qmail@web31813.mail.mud.yahoo.com> (raw)
In-Reply-To: <7vvempjcwy.fsf@assigned-by-dhcp.cox.net>
--- Junio C Hamano <junkio@cox.net> wrote:
> Luben Tuikov <ltuikov@yahoo.com> writes:
>
> >> If you rely on MERGE_MSG then you would need to clean it after
> >> commit is done. Currently it does not and checks MERGE_HEAD,
> >> and cleans up MERGE_HEAD when it is done. MERGE_MSG is not
> >> cleaned.
> >
> > It is cleaned in the lines of the patch you deleted, the section
> > just after the "elif" above:
>
> Ok, so I can apply that original one with your 'Oops' rolled
> into one patch?
Yes please.
Luben
prev parent reply other threads:[~2006-10-13 0:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-12 21:52 [PATCH] git-revert with conflicts to behave as git-merge with conflicts Luben Tuikov
2006-10-12 22:27 ` Junio C Hamano
2006-10-12 23:15 ` Luben Tuikov
2006-10-13 0:07 ` Junio C Hamano
2006-10-13 0:31 ` Luben Tuikov [this message]
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=20061013003120.98769.qmail@web31813.mail.mud.yahoo.com \
--to=ltuikov@yahoo.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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).