Re: [PATCH 2/4] pull: pass --allow-unrelated-histories to "git merge"
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 21, 2016, 21:32 UTC
- Message-ID
- <xmqq7ffqsl4m.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <CAGZ79kZgenHyvAKxKNGxKkybM=LgTfsvB7s91s1sQxxbp1xoFg@mail.gmail.com>
Stefan Beller <sbeller@google.com> writes:
Show 5 quoted lines
> On Thu, Apr 21, 2016 at 12:24 PM, Junio C Hamano <gitster@pobox.com> wrote: >> An earlier commit said: > > And by earlier you meant to say e379fdf34f (2016-03-18, merge: refuse > to create too cool a merge by default)?
The text quoted does come from that commit, but because there is nothing more that a reader would need to read from that commit to follow and understand this change, including its log message with the quoted parts, I did not give a reference to the commit, in order to avoid wasting readers' time. In other words, yes I meant that commit, and no, I didn't mean to "say" e379fdf.... I meant to say "An earlier commit" and taht is what I did.