From: "Ulrich Windl" <Ulrich.Windl@rz.uni-regensburg.de>
To: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Subject: Antw: Re: blank lines in pre-created merge message
Date: Thu, 25 Jul 2019 12:15:08 +0200 [thread overview]
Message-ID: <5D39812C020000A10003265F@gwsmtp.uni-regensburg.de> (raw)
>>> Johannes Schindelin <Johannes.Schindelin@gmx.de> schrieb am 25.07.2019 um
in Nachricht <nycvar.QRO.firstname.lastname@example.org>:
> Hi Ulrich,
> On Wed, 24 Jul 2019, Ulrich Windl wrote:
>> I think I had tried bringing this to your attention before, but I think it
>> without success.
>> The issue may seem purely cosmetical, while being easy to fix (is my
>> When using "git merge --no-ff --no-commit ..", the pre-created merge
>> always contains two empty lines in between the comment lines. However if
>> was a merge conflict (being resolved) an extra blank line is added after
>> first line.
>> In vi those empty lines are easy to spot, and I routinely remove them. But
>> maybe it's better not to create them at the beginning. (A "normal commit"
>> creates any emüpty lines in the pre-created comment)
> I could imagine that
> addresses that. Would be good if you could try; just build `pu` from
> https://github.com/git/git (`make install` will install it into your
> `$HOME/bin` and you can test that easily).
> If not, how about giving it a try to fix it yourself? This is open
> source, giving you great power to change the entire source code in your
> local repository as you wish. And of course, with great power... comes
> great responsibility.
I agree, but git isn't a tiny project: Could anybody provide a rough overview
how and where these editor comments are created? Then I could have a look
>> My Git version is 2.12.3, but the bug is probably quite old...
> You might think that the bug is probably quite old, but what is really
> old is your Git version. The current one is v2.22.0.
With old I mean 1.7.12 or older ;-)
> First order of business should be to verify that it has not been fixed
> in the meantime ;-)
Yeah, but for a fast-paced project you often find yourself busy with updating
all the time, leaving no time for your productive work (like Android
Don't expect too much from someone that drives as 26 year old car... (it's
easier to handle than the new ones) ;-)
next prev parent reply other threads:[~2019-07-25 10:15 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-24 9:54 blank lines in pre-created merge message Ulrich Windl
2019-07-25 10:07 ` Johannes Schindelin
2019-07-25 10:15 ` Ulrich Windl [this message]
2019-07-25 11:58 ` Antw: " Johannes Schindelin
2019-07-30 6:52 ` Ulrich Windl
2019-07-31 13:00 ` Johannes Schindelin
[not found] ` <5D437D21020000A100032A6F@gwsmtp.uni-regensburg.de>
[not found] ` <nycvar.QRO.email@example.com>
2019-08-02 12:55 ` Johannes Schindelin
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:
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
* 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.
Code repositories for project(s) associated with this public inbox
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).