From mboxrd@z Thu Jan  1 00:00:00 1970
From: Rainer Koenig <Rainer.Koenig@ts.fujitsu.com>
Subject: Re: 2 questions about git and merging
Date: Wed, 27 May 2015 06:55:30 +0200
Message-ID: <55654E42.8020503@ts.fujitsu.com>
References: <55647070.70909@ts.fujitsu.com>
 <20150526140427.GO12971@phenom.ffwll.local>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <dri-devel-bounces@lists.freedesktop.org>
Received: from dgate10.ts.fujitsu.com (dgate10.ts.fujitsu.com [80.70.172.49])
 by gabe.freedesktop.org (Postfix) with ESMTP id 7FF246E0D3
 for <dri-devel@lists.freedesktop.org>; Tue, 26 May 2015 21:55:33 -0700 (PDT)
In-Reply-To: <20150526140427.GO12971@phenom.ffwll.local>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Errors-To: dri-devel-bounces@lists.freedesktop.org
Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
To: Daniel Vetter <daniel@ffwll.ch>
Cc: "dri-devel@lists.freedesktop.org" <dri-devel@lists.freedesktop.org>
List-Id: dri-devel@lists.freedesktop.org

QW0gMjYuMDUuMjAxNSB1bSAxNjowNCBzY2hyaWViIERhbmllbCBWZXR0ZXI6Cgo+IC1uaWd0aGx5
IGlzIGEgcmViYXNpbmcgdHJlZSwgZ2l0IHB1bGwgZG9lcyB0aGUgd3JvbmcgdGhpbmcgZm9yIHRo
YXQuIFRoZQo+IHByb3BlciB3YXkgdG8gdHJhY2sgcmViYXNpbmcgYnJhbmNoZXMgaXMgKGFzc3Vt
aW5nIHlvdSBoYXZlIG5vIGxvY2FsCj4gcGF0Y2hlcyB0aGF0IHlvdSB3YW50IHRvIGtlZXApOgo+
IAo+ICQgZ2l0IGZldGNoIG9yaWdpbgo+ICQgZ2l0IHJlc2V0IC0taGFyZCBAe3Vwc3RyZWFtfQoK
VGhhbmsgeW91IGZvciB0aGUgZXhwbGFuYXRpb24uCgpSZWdhcmRzClJhaW5lcgotLSAKRGlwbC4t
SW5mLiAoRkgpIFJhaW5lciBLb2VuaWcKUHJvamVjdCBNYW5hZ2VyIExpbnV4IENsaWVudHMKRGVw
dC4gUERHIFdQUyBSJkQgU1cgT1NFCgpGdWppdHN1IFRlY2hub2xvZ3kgU29sdXRpb25zCkLDvHJn
ZXJtZWlzdGVyLVVsbHJpY2gtU3RyLiAxMDAKODYxOTkgQXVnc2J1cmcKR2VybWFueQoKVGVsZXBo
b25lOiArNDktODIxLTgwNC0zMzIxClRlbGVmYXg6ICAgKzQ5LTgyMS04MDQtMjEzMQpNYWlsOiAg
ICAgIG1haWx0bzpSYWluZXIuS29lbmlnQHRzLmZ1aml0c3UuY29tCgpJbnRlcm5ldCAgICAgICAg
IHRzLmZ1anRzdS5jb20KQ29tcGFueSBEZXRhaWxzICB0cy5mdWppdHN1LmNvbS9pbXByaW50Lmh0
bWwKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRl
dmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s
aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK