From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [RFC/PATCH] commit: make the error message on unmerged entries user-friendly.
Date: Wed, 06 Jan 2010 20:53:23 +0100 [thread overview]
Message-ID: <vpqocl76mdo.fsf@bauges.imag.fr> (raw)
In-Reply-To: <7v8wcbw14f.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Wed\, 06 Jan 2010 10\:15\:44 -0800")
Junio C Hamano <gitster@pobox.com> writes:
>> # Unmerged paths:
>> # (use "git add/rm <file>..." as appropriate to mark resolution)
[...]
> That one line we see above is concise and does mention "rm" as
> well. Why not use it?
Fine, you convinced me. I was thinking of a longer sentence, but "/rm"
doesn't harm.
>>> I think we should consolidate them all.
>>
>> Right, although "commit" is definitely the most important (dumb users
>> don't need "git merge").
>
> Your "dumb users" don't get the unmerged error from commit, either, if
> they don't need "git merge".
They'd use "pull", not merge. Anyway, I did it for commit, merge,
pull, revert, cherry-pick. I guess we covered the common cases.
The patch seems to have a lot of redundancies, but I think trying to
factor this into helper functions would be much more effort than the
few cut-and-paste that I had to do, since each instance is a slight
variant of each other ...
Patch follows. Let me know in case you prefer to split it.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2010-01-06 19:53 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-06 13:10 [RFC/PATCH] commit: make the error message on unmerged entries user-friendly Matthieu Moy
2010-01-06 17:13 ` Junio C Hamano
2010-01-06 17:49 ` Matthieu Moy
2010-01-06 18:15 ` Junio C Hamano
2010-01-06 19:53 ` Matthieu Moy [this message]
2010-01-06 20:05 ` Junio C Hamano
2010-01-06 20:15 ` Matthieu Moy
2010-01-06 20:17 ` [PATCH v2] Be more user-friendly when refusing to do something because of conflict Matthieu Moy
2010-01-06 20:36 ` [PATCH v3] " Matthieu Moy
2010-01-06 21:04 ` [PATCH v2] " Junio C Hamano
2010-01-07 15:34 ` Matthieu Moy
2010-01-07 15:35 ` [PATCH v4] " Matthieu Moy
2010-01-07 18:10 ` [PATCH v5] " Matthieu Moy
2010-01-13 6:56 ` 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=vpqocl76mdo.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 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.