From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Matthieu Moy <Matthieu.Moy@imag.fr>
Cc: git@vger.kernel.org, gitster@pobox.com,
Jonathan Nieder <jrnieder@gmail.com>
Subject: Re: [PATCH] Documentation/git-merge.txt: weaken warning about uncommited changes
Date: Tue, 18 Jun 2013 14:19:28 +0530 [thread overview]
Message-ID: <CALkWK0=USVa2htHSTyj4C7FrKEko-e_UGAnu-3UNvx_ue1vwig@mail.gmail.com> (raw)
In-Reply-To: <1371544975-18703-1-git-send-email-Matthieu.Moy@imag.fr>
Matthieu Moy wrote:
> Weaken the warning by discouraging only merge with /non-trivial/
> uncommited changes.
>
> I don't think documenting all the failure cases in the doc would be a
> good idea, so I've left the "in some cases" part.
It's already documented in the pre-merge checks section, as Jonathan
pointed out [1]. We should update the documentation to point to it: I
do not think "non-trivial" is much of an improvement.
[1]: http://thread.gmane.org/gmane.comp.version-control.git/221069/focus=221366
next prev parent reply other threads:[~2013-06-18 8:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-18 8:42 [PATCH] Documentation/git-merge.txt: weaken warning about uncommited changes Matthieu Moy
2013-06-18 8:49 ` Ramkumar Ramachandra [this message]
2013-06-18 8:56 ` Matthieu Moy
2013-06-18 14:57 ` 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='CALkWK0=USVa2htHSTyj4C7FrKEko-e_UGAnu-3UNvx_ue1vwig@mail.gmail.com' \
--to=artagnon@gmail.com \
--cc=Matthieu.Moy@imag.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@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).