On Tue, Sep 10, 2013 at 11:04 PM, Matthieu Moy
> Chris Packham <judge.pack...@gmail.com> writes:
>> On 10/09/13 21:19, Matthieu Moy wrote:
>>> 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
> # 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.
OK. I wouldn't miss that parts in parenthesis. If I chose to abort the
commit from the editor (e.g. :cq in vi) git status would still tell me
what I need to know.
> Matthieu Moy
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html