Re: [PATCH 2/4] pull: pass --allow-unrelated-histories to "git merge"

2016-04-21 Thread Junio C Hamano
Stefan Beller writes: > On Thu, Apr 21, 2016 at 12:24 PM, Junio C Hamano 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

Re: [PATCH 2/4] pull: pass --allow-unrelated-histories to "git merge"

2016-04-21 Thread Stefan Beller
On Thu, Apr 21, 2016 at 12:24 PM, Junio C Hamano 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)? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a

[PATCH 2/4] pull: pass --allow-unrelated-histories to "git merge"

2016-04-21 Thread Junio C Hamano
An earlier commit said: We could add the same option to "git pull" and have it passed through to underlying "git merge". I do not have a fundamental opposition against such a feature, but this commit does not do so and instead leaves it as low-hanging fruit for others,