public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox•com>
To: Jens Lehmann <Jens.Lehmann@web•de>
Cc: Johannes Sixt <j6t@kdbg•org>, Ari Pollak <ari@debian•org>,
	git@vger•kernel.org, Jeff King <peff@peff•net>
Subject: Re: Bug? diff.submodule=log adds text to commit -v message
Date: Wed, 13 Nov 2013 12:04:16 -0800	[thread overview]
Message-ID: <xmqq7gccdq67.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <5283C701.8090400@web.de> (Jens Lehmann's message of "Wed, 13 Nov 2013 19:37:53 +0100")

Jens Lehmann <Jens.Lehmann@web•de> writes:

>> If we were introducing a divider line for machine consumption, I do
>> not think it is wise to let that line even translated...
>
> Ok, but then it won't mean much to readers who don't understand
> English. I assume prefixing all diff lines with "# " is out of
> the question because of backwards compatibility, so what about
> using a descriptive text together with a scissor line? The former
> can be be translated (and won't make it into the commit message
> because it starts with a "#") while the latter serves as a robust
> divider line:
>
> # Everything below the following line is a diff that will be removed.
> # --------------------------------8<--------------------------------

Yeah, or swap them around if you are trying to protect the part
above the divider from getting contaminated by the noise.

  reply	other threads:[~2013-11-13 20:04 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-10 21:49 Bug? diff.submodule=log adds text to commit -v message Ari Pollak
2013-11-11 20:41 ` Jens Lehmann
2013-11-11 20:48   ` Ari Pollak
2013-11-11 21:29     ` Jens Lehmann
2013-11-11 21:34       ` Jens Lehmann
2013-11-11 23:24       ` Jeff King
2013-11-12  7:46       ` Johannes Sixt
2013-11-12 22:17         ` Jens Lehmann
2013-11-12 22:20           ` Junio C Hamano
2013-11-13 18:37             ` Jens Lehmann
2013-11-13 20:04               ` Junio C Hamano [this message]
2013-11-16 22:52                 ` [RFC PATCH] commit -v: strip diffs and submodule shortlogs from the commit message Jens Lehmann
2013-11-17  0:22                   ` Eric Sunshine
2013-11-17  8:53                     ` Jeff King
2013-11-17  9:09                   ` Jeff King
2013-11-17 12:20                     ` Jens Lehmann
2013-11-18 16:01                     ` Junio C Hamano
2013-11-19 18:47                       ` [PATCH v2 ] " Jens Lehmann
2013-11-19 19:07                         ` Junio C Hamano
2013-11-19 19:31                         ` Junio C Hamano
2013-11-19 19:42                           ` Junio C Hamano
2013-11-19 20:34                         ` Junio C Hamano
2013-11-19 21:01                           ` Jens Lehmann

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=xmqq7gccdq67.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=Jens.Lehmann@web$(echo .)de \
    --cc=ari@debian$(echo .)org \
    --cc=git@vger$(echo .)kernel.org \
    --cc=j6t@kdbg$(echo .)org \
    --cc=peff@peff$(echo .)net \
    /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