From: David Kastrup <dak@gnu.org>
To: Stephen Leake <stephen_leake@stephe-leake.org>
Cc: git@vger.kernel.org
Subject: Re: [RFC 0/3] Make git more user-friendly during a merge conflict
Date: Fri, 28 Feb 2014 15:21:39 +0100 [thread overview]
Message-ID: <87txbj1fnw.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <858usvz5nj.fsf@stephe-leake.org> (Stephen Leake's message of "Fri, 28 Feb 2014 08:13:52 -0600")
Stephen Leake <stephen_leake@stephe-leake.org> writes:
> David Kastrup <dak@gnu.org> writes:
>
>> "do the right thing" commands also tend to do the wrong thing
>> occasionally with potentially disastrous results when they are used
>> in scripts where the followup actions rely on the actual result.
>
> That is bad, and should not be allowed. On the other hand, I have yet
> to see an actual use case of bad behavior in this discussion.
Huh.
<http://permalink.gmane.org/gmane.comp.version-control.git/242744>
--
David Kastrup
next prev parent reply other threads:[~2014-02-28 14:21 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-26 18:06 [RFC 0/3] Make git more user-friendly during a merge conflict Andrew Wong
2014-02-26 18:06 ` [RFC 1/3] wt-status: Make conflict hint message more consistent with other hints Andrew Wong
2014-02-26 20:34 ` Jonathan Nieder
2014-02-26 20:37 ` Junio C Hamano
2014-02-26 23:07 ` Andrew Wong
2014-02-26 18:06 ` [RFC 2/3] merge: Add hints to tell users about "git merge --abort" Andrew Wong
2014-02-26 20:38 ` Jonathan Nieder
2014-02-26 23:16 ` Andrew Wong
2014-03-05 15:30 ` Andrew Wong
2014-03-05 18:29 ` Junio C Hamano
2014-03-05 20:51 ` Andrew Wong
2014-03-05 21:20 ` Junio C Hamano
2014-03-05 18:35 ` Matthieu Moy
2014-02-26 18:06 ` [RFC 3/3] reset: Change the default behavior to use "--merge" during a merge Andrew Wong
2014-02-26 18:21 ` Matthieu Moy
2014-02-26 20:15 ` Andrew Wong
2014-02-26 20:48 ` Jonathan Nieder
2014-02-26 23:37 ` Andrew Wong
2014-02-26 20:57 ` Matthieu Moy
2014-02-27 0:00 ` Andrew Wong
2014-02-26 20:53 ` Junio C Hamano
2014-03-11 4:39 ` Andrew Wong
2014-02-26 20:26 ` [RFC 0/3] Make git more user-friendly during a merge conflict Jonathan Nieder
2014-02-28 9:01 ` Stephen Leake
2014-02-28 9:14 ` Charles Bailey
2014-02-28 10:11 ` David Kastrup
2014-02-28 14:13 ` Stephen Leake
2014-02-28 14:21 ` David Kastrup [this message]
2014-02-28 17:26 ` Stephen Leake
2014-02-28 17:33 ` David Kastrup
2014-03-01 10:32 ` Stephen Leake
2014-03-01 11:38 ` Matthieu Moy
2014-03-01 16:50 ` Stephen Leake
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=87txbj1fnw.fsf@fencepost.gnu.org \
--to=dak@gnu.org \
--cc=git@vger.kernel.org \
--cc=stephen_leake@stephe-leake.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.