From: Junio C Hamano Date: Mon, 07 Nov 2011 16:44:24 GMT Subject: Re: [PATCH v2] pull: introduce a pull.rebase option to enable --rebase Message-ID: <7v39dz3ms7.fsf@alter.siamese.dyndns.org> In-Reply-To: Ævar Arnfjörð Bjarmason writes: > On Sun, Nov 6, 2011 at 20:53, Johannes Sixt wrote: >> When you continue an indented item in a separate paragraph, then you >> must not use an empty line, but have line with '+' and un-indented >> continuation paragraphs. See examples in this file. > > Thanks for spotting that. > > Junio: Should I spam you with another patch or is something you'd > prefer to just fix up? It is about the same amount of work for me; I've just dedented the two paragraphs that start with "*NOTE*:" and replaced the blank lines before them with a single "+". Is that what you wanted to resend, or is there anything else?