From: John Tapsell <johnflux@gmail.com>
To: Clemens Buchacher <drizzd@aon.at>
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 12:05:31 +0100 [thread overview]
Message-ID: <43d8ce650905310405k4fa17240se7701e5fab2b22a7@mail.gmail.com> (raw)
In-Reply-To: <20090531104359.GA19094@localhost>
> "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?
If it sometimes or always fails, then doesn't it seem kinda confusing
if the user is told to run that command, but then when they do they
get an error?
John
next prev parent reply other threads:[~2009-05-31 11:09 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 [this message]
2009-05-31 14:05 ` Clemens Buchacher
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=43d8ce650905310405k4fa17240se7701e5fab2b22a7@mail.gmail.com \
--to=johnflux@gmail.com \
--cc=cxreg@pobox.com \
--cc=drizzd@aon.at \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).