From: Matthieu Moy <Matthieu.Moy@grenoble-inp•fr>
To: Chris Packham <judge.packham@gmail•com>
Cc: "git\@vger.kernel.org" <git@vger•kernel.org>
Subject: Re: [RFC] Disabling status hints in COMMIT_EDITMSG
Date: Tue, 10 Sep 2013 13:04:18 +0200 [thread overview]
Message-ID: <vpqtxhtey4t.fsf@anie.imag.fr> (raw)
In-Reply-To: <522EEC28.6020405@gmail.com> (Chris Packham's message of "Tue, 10 Sep 2013 21:53:44 +1200")
Chris Packham <judge.packham@gmail•com> writes:
> On 10/09/13 21:19, Matthieu Moy wrote:
>> Hi,
>>
>> I just noticed that the template COMMIT_EDITMSG was containing status
>> hints, and that they were not particularty helpfull _during_ a commit. I
>> think it would be sensible to ignore advice.statusHints and disable
>> hints unconditionally when writting to COMMIT_EDITMSG.
>>
>> Any objection?
>>
>
> I did recently find them useful/reassuring when I was committing a
> merge. But I wouldn't consider that a strong objection.
Just to make sure we're talking about the same thing: when commiting a
merge, the template currently looks like:
Merge branch 'master' of /tmp/git
Conflicts:
foo.txt
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
# .git/MERGE_HEAD
# and try again.
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 3 and 1 different commit each, respectively.
# (use "git pull" to merge the remote branch into yours)
#
# All conflicts fixed but you are still merging.
# (use "git commit" to conclude merge)
#
# Changes to be committed:
#
# modified: foo.txt
#
What I'd like to remove are the parts between parenthesis :
(use "git commit" to conclude merge)
(use "git pull" to merge the remote branch into yours)
The first part (It looks like [...]) would remain, of course.
Actually, even the "All conflicts fixed but you are still merging." part
is not really accurate when the commit is already started.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2013-09-10 11:04 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-10 9:19 [RFC] Disabling status hints in COMMIT_EDITMSG Matthieu Moy
2013-09-10 9:53 ` Chris Packham
2013-09-10 11:04 ` Matthieu Moy [this message]
2013-09-10 21:11 ` Chris Packham
2013-09-10 16:42 ` Junio C Hamano
2013-09-11 7:24 ` Matthieu Moy
2013-09-11 7:42 ` Javier Domingo
2013-09-11 8:05 ` Matthieu Moy
2013-09-11 9:14 ` John Szakmeister
2013-09-11 14:03 ` Javier Domingo
2013-09-11 17:24 ` Junio C Hamano
2013-09-11 17:40 ` Matthieu Moy
2013-09-10 18:03 ` Jonathan Nieder
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=vpqtxhtey4t.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp$(echo .)fr \
--cc=git@vger$(echo .)kernel.org \
--cc=judge.packham@gmail$(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