On Sat, Mar 09, 2013 at 06:45:56PM +0100, Jens Lehmann wrote:
> Am 07.03.2013 19:59, schrieb Heiko Voigt:
> > On Thu, Mar 07, 2013 at 10:49:09AM +0100, Daniel Bratell wrote:
> >> Den 2013-03-06 19:12:05 skrev Heiko Voigt :
> >>> So to summarize what you are requesting: You want a submodule merge be
Am 07.03.2013 19:59, schrieb Heiko Voigt:
> On Thu, Mar 07, 2013 at 10:49:09AM +0100, Daniel Bratell wrote:
>> Den 2013-03-06 19:12:05 skrev Heiko Voigt :
>>
>>> On Mon, Feb 25, 2013 at 05:44:05PM +0100, Daniel Bratell wrote:
A submodule change can be merged, but only if the merge is a
"f
On Thu, Mar 07, 2013 at 10:49:09AM +0100, Daniel Bratell wrote:
> Den 2013-03-06 19:12:05 skrev Heiko Voigt :
>
> >On Mon, Feb 25, 2013 at 05:44:05PM +0100, Daniel Bratell wrote:
> >>A submodule change can be merged, but only if the merge is a
> >>"fast-forward" which I think is a fair demand, but
Den 2013-03-06 19:12:05 skrev Heiko Voigt :
On Mon, Feb 25, 2013 at 05:44:05PM +0100, Daniel Bratell wrote:
I can phrase this in two ways and I'll start with the short way:
Why does a merge of a git submodule use as merge-base the commit that
was
active in the merge-base of the parent repo,
On Mon, Feb 25, 2013 at 05:44:05PM +0100, Daniel Bratell wrote:
> I can phrase this in two ways and I'll start with the short way:
>
> Why does a merge of a git submodule use as merge-base the commit that was
> active in the merge-base of the parent repo, rather than the merge-base of
> the tw
I can phrase this in two ways and I'll start with the short way:
Why does a merge of a git submodule use as merge-base the commit that was
active in the merge-base of the parent repo, rather than the merge-base of
the two commits that are being merged?
The long question is:
A submodule cha
6 matches
Mail list logo
