From: Junio C Hamano <gitster@pobox•com>
To: Ralf Thielow <ralf.thielow@gmail•com>
Cc: Eric Sunshine <sunshine@sunshineco•com>, Git List <git@vger•kernel.org>
Subject: Re: [PATCH] sequencer.c: abbreviate hashs placed in the middle of messages
Date: Fri, 08 May 2015 13:24:49 -0700 [thread overview]
Message-ID: <xmqqa8xekeb2.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CAN0XMO+ZY-oXb1aWK3TzUxDRuBEEoasxjdagYQQoB+JVheju9Q@mail.gmail.com> (Ralf Thielow's message of "Fri, 8 May 2015 21:56:58 +0200")
Ralf Thielow <ralf.thielow@gmail•com> writes:
> Junio C Hamano <gitster@pobox•com> wrote:
>
>> And shortening the output feels to me a more expedient thing to do
>> because we do not have to analyse the ramification of possible
>> information loss (your "It has value since..."). If we analyse the
>> issue well, we might realize that there is little point in showing
>> the commit object name in hexadecimal, be it in full or in shortened
>> form.
>>
>> If the proposal were to parrot what the user typed on the command
>> line, e.g. one of these (or their rephrased versions)
>>
>> error: commit 'next' is a merge but no -m option was given.
>> error: no -m option was given to pick a merge 'next'.
>>
>> against the above example, then I would say that would be an
>> improvement, but that is not what is being discussed, so...
>
> Commits to be merged don't have to be branches.
I am not sure how that changes anything.
$ git cherry-pick 38e70713119c25ab5699df6b2fb13e4133d399ab
error: that commit is a merge and you didn't give me -m <which-parent>
$ git cherry-pick 38e70713119c25ab5699df6b2fb13e4133d399ab
error: the commit 38e707... is a merge and you didn't give me -m <which-parent>
Puzzled.
next prev parent reply other threads:[~2015-05-08 20:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-08 16:53 [PATCH] sequencer.c: abbreviate hashs placed in the middle of messages Ralf Thielow
2015-05-08 17:10 ` Eric Sunshine
2015-05-08 17:20 ` Ralf Thielow
2015-05-08 17:20 ` Junio C Hamano
2015-05-08 17:26 ` Ralf Thielow
2015-05-08 17:31 ` Junio C Hamano
2015-05-08 17:58 ` Ralf Thielow
2015-05-08 18:42 ` Junio C Hamano
2015-05-08 19:56 ` Ralf Thielow
2015-05-08 20:24 ` Junio C Hamano [this message]
2015-05-08 20:57 ` Ralf Thielow
2015-05-10 9:05 ` Matthieu Moy
2015-05-10 19:17 ` Junio C Hamano
2015-05-10 19:36 ` Matthieu Moy
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=xmqqa8xekeb2.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=ralf.thielow@gmail$(echo .)com \
--cc=sunshine@sunshineco$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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