From mboxrd@z Thu Jan  1 00:00:00 1970
From: Rainer Koenig <Rainer.Koenig@ts.fujitsu.com>
Subject: 2 questions about git and merging
Date: Tue, 26 May 2015 15:09:04 +0200
Message-ID: <55647070.70909@ts.fujitsu.com>
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 dgate20.ts.fujitsu.com (dgate20.ts.fujitsu.com [80.70.172.51])
 by gabe.freedesktop.org (Postfix) with ESMTP id B47B36E68B
 for <dri-devel@lists.freedesktop.org>; Tue, 26 May 2015 06:09:07 -0700 (PDT)
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: dri-devel@lists.freedesktop.org
List-Id: dri-devel@lists.freedesktop.org

SGksCgphIHdlZWsgYWdvIEkgZXhwZXJpZW5jZWQgcHJvYmxlbXMgb24gdGhlIHNreWxha2UgcGxh
dGZvcm0gYW5kIGdvdCB0aGUKYWRpdmNlIHRvIHRyeSBvdXQgdGhlIGRybS1pbnRlbC1uaWdodGx5
IGJyYW5jaC4gSSB0cmllZCBhbmQgaXQgd2FzIGEKc3VjY2Vzcy4KClNvIGFmdGVyIHRoZSBpbml0
aWFsICJnaXQgY2xvbmUiIG9mIHRoZSB0cmVlIEkgdHJpZWQgdG8ga2VlcCB1cGRhdGVkIGJ5CmRv
aW5nIGEgImdpdCBwdWxsIiBmcm9tIHRpbWUgdG8gdGltZSwgYnV0IHdoYXQncyByZWFsbHkgc3Ry
YW5nZSBpcyB0aGF0CkkgZ290IG1lcmdlIGNvbmZsaWN0cywgdXN1YWxseSBpbiB0aGUgZmlsZSBp
bnRlZ3JhdGlvbi1tYW5pZmVzdCwgYnV0CnNvbWV0aW1lcyBhbHNvIGluIHNvdXJjZSBmaWxlcy4K
ClRoYXQncyBsb29rcyBzb21ld2hhdCB3ZWlyZCBiZWNhdXNlIEkgZGlkbid0IHRvdWNoIGFueSBv
ZiB0aGUgZmlsZXMgaW4KdGhlIHRyZWUgYW5kIEkgdGhvdWdodCB0aGF0IGFmdGVyIGNsb25pbmcg
YSBmcmVxdWVudCAiZ2l0IHB1bGwiIHdpbGwKa2VlcCBtZSB1cCB0byBkYXRlIHdpdGhvdXQgdGhl
IG5lZWQgdG8gcmVzb2x2ZSBtZXJnZSBjb25mbGljdHMuCgpXaGF0IGlzIHdyb25nIHdpdGggbXkg
dGhvdWdodD8gV2hhdCBkaWQgSSBkbyB3cm9uZz8KClNlY29uZCwgSSBwdWxsZWQgdGhlICJMaW51
cyItdHJlZSB0b2RheSBhbmQgZm91bmQgc29tZSBsb2cgZW50cmllcyB0aGF0CnNhaWQKIE1lcmdl
IGJyYW5jaCAnZHJtLWZpeGVzLTQuMScgb2YKZ2l0Oi8vcGVvcGxlLmZyZWVkZXNrdG9wLm9yZy9+
YWdkNWYvbGludXggaW50byBkcm0tZml4ZXMKCmFuZAogTWVyZ2UgdGFnICdkcm0taW50ZWwtZml4
ZXMtMjAxNS0wNS0yMScgb2YKZ2l0Oi8vYW5vbmdpdC5mcmVlZGVza3RvcC5vcmcvZHJtLWludGVs
IGludG8gZHJtLWZpeGVzCgpTbyBJIGFzc3VtZWQsIHRoYXQgdGhlIGZpeCBJIHByb3ZlZCB0byB3
b3JrIG9uZSB3ZWVrIGFnbyBub3cgc2hvdWxkIGFsc28KYmUgYXZhaWxhYmxlIGluIHRoZSAidmFu
aWxsYSIgdHJlZS4gU28gSSBjb21waWxlZCB0aGF0IG9uIG15IHRlc3QKbWFjaGluZSBhbmQgZ290
IG15IGJ1ZyBiYWNrLiA6LSgKClNvIG15IG90aGVyIHF1ZXN0aW9uIGlzLCBob3cgZG8gZml4ZXMg
ZnJvbSBkcm0taW50ZWwtbmlnaHRseSBmaW5kIHRoZWlyCndlYXkgaW50byB0aGUgInZhbmlsbGEi
IGxpbnV4IHRyZWU/IElzIHRoZXJlIHNvbWUgc29ydCBvZiBwcm9jZXNzCmRlc2NyaXB0aW9uLgoK
VGhhbmtzIGZvciBhbnkgZXhwbGFuYXRpb24KUmFpbmVyCi0tIApEaXBsLi1JbmYuIChGSCkgUmFp
bmVyIEtvZW5pZwpQcm9qZWN0IE1hbmFnZXIgTGludXggQ2xpZW50cwpEZXB0LiBQREcgV1BTIFIm
RCBTVyBPU0UKCkZ1aml0c3UgVGVjaG5vbG9neSBTb2x1dGlvbnMKQsO8cmdlcm1laXN0ZXItVWxs
cmljaC1TdHIuIDEwMAo4NjE5OSBBdWdzYnVyZwpHZXJtYW55CgpUZWxlcGhvbmU6ICs0OS04MjEt
ODA0LTMzMjEKVGVsZWZheDogICArNDktODIxLTgwNC0yMTMxCk1haWw6ICAgICAgbWFpbHRvOlJh
aW5lci5Lb2VuaWdAdHMuZnVqaXRzdS5jb20KCkludGVybmV0ICAgICAgICAgdHMuZnVqdHN1LmNv
bQpDb21wYW55IERldGFpbHMgIHRzLmZ1aml0c3UuY29tL2ltcHJpbnQuaHRtbApfX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBs
aXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNr
dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=