From: Junio C Hamano <gitster@pobox.com>
To: "Avery Pennarun" <apenwarr@gmail.com>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Thomas Rast" <trast@student.ethz.ch>,
git@vger.kernel.org, "Jakub Narebski" <jnareb@gmail.com>,
"Miklos Vajna" <vmiklos@frugalware.org>
Subject: Re: [PATCH] Documentation: warn against merging in a dirty tree
Date: Mon, 15 Sep 2008 17:06:34 -0700 [thread overview]
Message-ID: <7vprn57y45.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <32541b130809151653w27d7876fp35e0967d597ae2a9@mail.gmail.com> (Avery Pennarun's message of "Mon, 15 Sep 2008 19:53:07 -0400")
"Avery Pennarun" <apenwarr@gmail.com> writes:
> But how do you abort a *failed* merge in a situation like Linus's
> example? "git reset --hard HEAD" would destroy the unstaged Makefile
> change.
"All of your work tree changes are easily reproducible" implies you do not
mind losing them, Ok?
Also "git reset HEAD" (that is, without --hard) would not touch the work
tree changes. You need to remove the work-tree cruft left by new files
yourself, if you go this route, though. New files are rare enough so it
may be more appropriate (and you can "git clean -n $that_subdirectory" to
enumerate them).
It all depends on your workflow.
next prev parent reply other threads:[~2008-09-16 0:07 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-15 22:48 [IRC/patches] Failed octopus merge does not clean up Thomas Rast
2008-09-15 22:49 ` [PATCH] Add test that checks octopus merge cleanup Thomas Rast
2008-09-15 22:49 ` [PATCH] Documentation: warn against merging in a dirty tree Thomas Rast
2008-09-15 23:42 ` Junio C Hamano
2008-09-15 23:53 ` Avery Pennarun
2008-09-16 0:06 ` Junio C Hamano [this message]
2008-09-18 15:15 ` Linus Torvalds
2008-09-18 18:18 ` Avery Pennarun
2008-09-19 20:28 ` Junio C Hamano
2008-09-15 23:36 ` [IRC/patches] Failed octopus merge does not clean up Junio C Hamano
2008-09-15 23:47 ` Thomas Rast
2008-09-16 0:20 ` Junio C Hamano
2008-09-16 22:53 ` Jakub Narebski
2008-09-17 6:45 ` Andreas Ericsson
2008-09-17 8:11 ` Jakub Narebski
2008-09-17 15:59 ` Miklos Vajna
2008-09-17 16:40 ` Andreas Ericsson
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=7vprn57y45.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
--cc=trast@student.ethz.ch \
--cc=vmiklos@frugalware.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.