From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Ulrich Windl <Ulrich.Windl@rz.uni-regensburg.de>
Cc: git@vger.kernel.org
Subject: Re: Antw: Re: blank lines in pre-created merge message
Date: Thu, 25 Jul 2019 13:58:35 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1907251355500.21907@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <5D39812C020000A10003265F@gwsmtp.uni-regensburg.de>
Hi Ulrich,
On Thu, 25 Jul 2019, Ulrich Windl wrote:
> >>> Johannes Schindelin <Johannes.Schindelin@gmx.de> schrieb am 25.07.2019 um
> 12:07
> in Nachricht <nycvar.QRO.7.76.6.1907251204310.21907@tvgsbejvaqbjf.bet>:
> >
> > On Wed, 24 Jul 2019, Ulrich Windl wrote:
> >
> >> When using "git merge --no-ff --no-commit ..", the pre-created
> >> merge message always contains two empty lines in between the
> >> comment lines. However if there was a merge conflict (being
> >> resolved) an extra blank line is added after the fiVrst line.
>
> [...]
> Could anybody provide a rough overview how and where these editor
> comments are created?
The best bet would be to call `git grep` with text in that pre-created
merge message, preferably some text that is most likely fixed, i.e. that
does not depend on the current worktree/commit.
If you give me an example of such a merge message, I can provide you
with the appropriate `git grep` call and the code locations to touch.
Ciao,
Johannes
next prev parent reply other threads:[~2019-07-25 11:58 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 ` Antw: " Ulrich Windl
2019-07-25 11:58 ` Johannes Schindelin [this message]
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.7.76.6.1908021449400.46@tvgsbejvaqbjf.bet>
2019-08-02 12:55 ` Johannes Schindelin
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
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 \
--in-reply-to=nycvar.QRO.7.76.6.1907251355500.21907@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=Ulrich.Windl@rz.uni-regensburg.de \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).