From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/2] user-manual: Document that "git merge" doesn't like uncommited changes.
Date: Mon, 23 Nov 2009 08:51:07 +0100 [thread overview]
Message-ID: <vpqd439he6s.fsf@bauges.imag.fr> (raw)
In-Reply-To: <7vy6lyaz9b.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Sun\, 22 Nov 2009 15\:57\:52 -0800")
Junio C Hamano <gitster@pobox.com> writes:
> The work tree is overwritten by the result of the
> merge when this combining is done cleanly, and the result is
> committed. Otherwise it is
> overwritten by a half-merged results when this combining results
I thought of something like this, but this is slightly incorrect in
case of fast-forward (Git doesn't "commit", but "reuses" a commit), so
I prefered making a separate paragraph.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2009-11-23 7:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-20 15:59 [RFC/PATCH 0/2] Explain newbies the "commit before pull" flow Matthieu Moy
2009-11-20 15:59 ` [PATCH 1/2] merge-recursive: point the user to commit when file would be overwritten Matthieu Moy
2009-11-20 18:05 ` Junio C Hamano
2009-11-22 22:09 ` Matthieu Moy
2009-11-20 15:59 ` [PATCH 2/2] user-manual: Document that "git merge" doesn't like uncommited changes Matthieu Moy
2009-11-20 20:19 ` Junio C Hamano
2009-11-22 22:18 ` Matthieu Moy
2009-11-22 23:57 ` Junio C Hamano
2009-11-23 7:51 ` Matthieu Moy [this message]
2009-11-22 22:26 ` [PATCH 1/2 v2] merge-recursive: point the user to commit when file would be overwritten Matthieu Moy
2009-11-22 22:26 ` [PATCH 2/2 v2] user-manual: Document that "git merge" doesn't like uncommited changes Matthieu Moy
2009-11-23 0:08 ` Junio C Hamano
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=vpqd439he6s.fsf@bauges.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--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