From: Clemens Buchacher <drizzd@aon.at>
To: John Tapsell <johnflux@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org, Dave Olszewski <cxreg@pobox.com>
Subject: Re: [PATCH] refuse to merge during a merge
Date: Sun, 31 May 2009 16:05:00 +0200 [thread overview]
Message-ID: <20090531140500.GA24862@localhost> (raw)
In-Reply-To: <43d8ce650905310405k4fa17240se7701e5fab2b22a7@mail.gmail.com>
On Sun, May 31, 2009 at 12:05:31PM +0100, John Tapsell wrote:
> > "git reset --hard" is not suggested, because it potentially removes
> > changes unrelated to the merge (if the work tree was dirty prior to
> > the merge).
>
> Sorry could you just clarify... if the user does "git reset HEAD"
> will that sometimes always or never fail?
It will never fail. It aborts the merge as suggested. But "git reset --hard
HEAD" would also reset the work tree, so that "any changes to tracked files
in the working tree since <commit> are lost." This is generally desireable,
since an incomplete merge also leaves the auto-merged files in the work
tree.
But if the user does not already know that, it's better to leave the user
wondering how to clean a dirty work tree, than to suggest a potentially
harmful operation.
Clemens
next prev parent reply other threads:[~2009-05-31 14:05 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-27 21:04 [PATCH] refuse to merge during a merge Clemens Buchacher
2009-05-28 16:00 ` Constantine Plotnikov
2009-05-28 16:12 ` John Tapsell
2009-05-30 8:37 ` Clemens Buchacher
2009-05-30 10:38 ` Jakub Narebski
2009-05-30 10:57 ` Thomas Rast
2009-05-31 10:43 ` Clemens Buchacher
2009-05-31 11:05 ` John Tapsell
2009-05-31 14:05 ` Clemens Buchacher [this message]
2009-05-31 19:36 ` Junio C Hamano
2009-06-01 9:20 ` [PATCH v3] " Clemens Buchacher
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=20090531140500.GA24862@localhost \
--to=drizzd@aon.at \
--cc=cxreg@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johnflux@gmail.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).