From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jani Nikula <jani.nikula@linux.intel.com>
Subject: Re: [PATCH v2] dim: Try git-merge --ff-only before
	git-rebase -i when updating branches.
Date: Wed, 07 Dec 2016 20:09:29 +0200
Message-ID: <871sxjmx0m.fsf@intel.com>
References: <1481017719-5463-1-git-send-email-maarten.lankhorst@linux.intel.com>
 <87h96gxev2.fsf@intel.com>
 <75cfd30e-19dd-e742-5102-ca743e4b9fea@linux.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 48DC86E60A
 for <intel-gfx@lists.freedesktop.org>; Wed,  7 Dec 2016 18:09:33 +0000 (UTC)
In-Reply-To: <75cfd30e-19dd-e742-5102-ca743e4b9fea@linux.intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

T24gV2VkLCAwNyBEZWMgMjAxNiwgTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0
QGxpbnV4LmludGVsLmNvbT4gd3JvdGU6Cj4gT3AgMDctMTItMTYgb20gMTA6MzMgc2NocmVlZiBK
YW5pIE5pa3VsYToKPj4gT24gVHVlLCAwNiBEZWMgMjAxNiwgTWFhcnRlbiBMYW5raG9yc3QgPG1h
YXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4gd3JvdGU6Cj4+PiBXaGVuIGEgYnJhbmNo
IGNhbiBiZSBmYXN0LWZvcndhcmRlZCwgdHJ5IGl0IGZpcnN0IGJlZm9yZSByZWJhc2luZy4KPj4+
IFRoaXMgd2lsbCBwcmV2ZW50IGEgd2hvbGUgbG90IG9mIGVkaXRvciB3aW5kb3dzIG9wZW5pbmcg
d2l0aCAnbm9vcCcKPj4+IHdoZW4gcnVubmluZyBkaW0gdWIuCj4+Pgo+Pj4gU2lnbmVkLW9mZi1i
eTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4K
Pj4+IC0tLQo+Pj4gIGRpbSB8IDQgKy0tLQo+Pj4gIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlv
bigrKSwgMyBkZWxldGlvbnMoLSkKPj4+Cj4+PiBkaWZmIC0tZ2l0IGEvZGltIGIvZGltCj4+PiBp
bmRleCBmYTYzYWU4YzhhNzkuLmIyZTY4NDFlMjNkNyAxMDA3NTUKPj4+IC0tLSBhL2RpbQo+Pj4g
KysrIGIvZGltCj4+PiBAQCAtMTI4Niw5ICsxMjg2LDcgQEAgZnVuY3Rpb24gZGltX3VwZGF0ZV9i
cmFuY2hlcwo+Pj4gIAkJcmVwbz1gYnJhbmNoX3RvX3JlcG8gJGJyYW5jaGAKPj4+ICAJCXJlbW90
ZT1gcmVwb190b19yZW1vdGUgJHJlcG9gCj4+PiAgCj4+PiAtCQlpZiBnaXQgZGlmZiAtLXF1aWV0
ICRyZW1vdGUvJGJyYW5jaDsgdGhlbgo+Pj4gLQkJCSREUlkgZ2l0IHJlYmFzZQo+Pj4gLQkJZWxz
ZQo+Pj4gKwkJaWYgISAkRFJZIGdpdCBtZXJnZSAtLWZmLW9ubHkgOyB0aGVuCj4+IFdoYXQgZG9l
cyBpdCBhc3N1bWUgZm9yIGJyYW5jaGVzIHRvIG1lcmdlIHdoZW4gbm9uZSBhcmUgcHJvdmlkZWQ/
IFdvdWxkCj4+IGl0IGJlIGJldHRlciB0byBiZSBleHBsaWNpdD8KPj4KPj4gVGhhbmtzIGZvciB0
aGlzLCBJJ3ZlIGJlZW4gbWVhbmluZyB0byBkbyB0aGlzIGZvcmV2ZXIuLi4KPgo+IEhtIEkgZ3Vl
c3MgZXhwbGljaXQgbWlnaHQgYmUgYmV0dGVyLCB3aGF0IGFib3V0IHRoaXM/Cj4gLS0tLS0tODwt
LS0tLS0tCj4gV2hlbiBhIGJyYW5jaCBjYW4gYmUgZmFzdC1mb3J3YXJkZWQsIHRyeSBpdCBmaXJz
dCBiZWZvcmUgcmViYXNpbmcuCj4gVGhpcyB3aWxsIHByZXZlbnQgYSB3aG9sZSBsb3Qgb2YgZWRp
dG9yIHdpbmRvd3Mgb3BlbmluZyB3aXRoICdub29wJwo+IHdoZW4gcnVubmluZyBkaW0gdWIuCgpM
R1RNLgoKPgo+IFNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmto
b3JzdEBsaW51eC5pbnRlbC5jb20+Cj4gLS0tCj4gZGlmZiAtLWdpdCBhL2RpbSBiL2RpbQo+IGlu
ZGV4IGZhNjNhZThjOGE3OS4uZTA1NTFhY2U1NGU0IDEwMDc1NQo+IC0tLSBhL2RpbQo+ICsrKyBi
L2RpbQo+IEBAIC0xMjg2LDkgKzEyODYsNyBAQCBmdW5jdGlvbiBkaW1fdXBkYXRlX2JyYW5jaGVz
Cj4gIAkJcmVwbz1gYnJhbmNoX3RvX3JlcG8gJGJyYW5jaGAKPiAgCQlyZW1vdGU9YHJlcG9fdG9f
cmVtb3RlICRyZXBvYAo+ICAKPiAtCQlpZiBnaXQgZGlmZiAtLXF1aWV0ICRyZW1vdGUvJGJyYW5j
aDsgdGhlbgo+IC0JCQkkRFJZIGdpdCByZWJhc2UKPiAtCQllbHNlCj4gKwkJaWYgISAkRFJZIGdp
dCBtZXJnZSAtLWZmLW9ubHkgJHJlbW90ZS8kYnJhbmNoOyB0aGVuCj4gIAkJCSREUlkgZ2l0IHJl
YmFzZSAtaQo+ICAJCWZpCj4gIAlkb25lCj4KCi0tIApKYW5pIE5pa3VsYSwgSW50ZWwgT3BlbiBT
b3VyY2UgVGVjaG5vbG9neSBDZW50ZXIKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl
ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu
Zm8vaW50ZWwtZ2Z4Cg==