From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH v2] dim: Try git-merge --ff-only before
 git-rebase -i when updating branches.
Date: Wed, 7 Dec 2016 18:12:43 +0100
Message-ID: <75cfd30e-19dd-e742-5102-ca743e4b9fea@linux.intel.com>
References: <1481017719-5463-1-git-send-email-maarten.lankhorst@linux.intel.com>
 <87h96gxev2.fsf@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 mga03.intel.com (mga03.intel.com [134.134.136.65])
 by gabe.freedesktop.org (Postfix) with ESMTPS id D70A46E5F7
 for <intel-gfx@lists.freedesktop.org>; Wed,  7 Dec 2016 17:12:45 +0000 (UTC)
In-Reply-To: <87h96gxev2.fsf@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: Jani Nikula <jani.nikula@linux.intel.com>, intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

T3AgMDctMTItMTYgb20gMTA6MzMgc2NocmVlZiBKYW5pIE5pa3VsYToKPiBPbiBUdWUsIDA2IERl
YyAyMDE2LCBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwu
Y29tPiB3cm90ZToKPj4gV2hlbiBhIGJyYW5jaCBjYW4gYmUgZmFzdC1mb3J3YXJkZWQsIHRyeSBp
dCBmaXJzdCBiZWZvcmUgcmViYXNpbmcuCj4+IFRoaXMgd2lsbCBwcmV2ZW50IGEgd2hvbGUgbG90
IG9mIGVkaXRvciB3aW5kb3dzIG9wZW5pbmcgd2l0aCAnbm9vcCcKPj4gd2hlbiBydW5uaW5nIGRp
bSB1Yi4KPj4KPj4gU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFu
a2hvcnN0QGxpbnV4LmludGVsLmNvbT4KPj4gLS0tCj4+ICBkaW0gfCA0ICstLS0KPj4gIDEgZmls
ZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMyBkZWxldGlvbnMoLSkKPj4KPj4gZGlmZiAtLWdp
dCBhL2RpbSBiL2RpbQo+PiBpbmRleCBmYTYzYWU4YzhhNzkuLmIyZTY4NDFlMjNkNyAxMDA3NTUK
Pj4gLS0tIGEvZGltCj4+ICsrKyBiL2RpbQo+PiBAQCAtMTI4Niw5ICsxMjg2LDcgQEAgZnVuY3Rp
b24gZGltX3VwZGF0ZV9icmFuY2hlcwo+PiAgCQlyZXBvPWBicmFuY2hfdG9fcmVwbyAkYnJhbmNo
YAo+PiAgCQlyZW1vdGU9YHJlcG9fdG9fcmVtb3RlICRyZXBvYAo+PiAgCj4+IC0JCWlmIGdpdCBk
aWZmIC0tcXVpZXQgJHJlbW90ZS8kYnJhbmNoOyB0aGVuCj4+IC0JCQkkRFJZIGdpdCByZWJhc2UK
Pj4gLQkJZWxzZQo+PiArCQlpZiAhICREUlkgZ2l0IG1lcmdlIC0tZmYtb25seSA7IHRoZW4KPiBX
aGF0IGRvZXMgaXQgYXNzdW1lIGZvciBicmFuY2hlcyB0byBtZXJnZSB3aGVuIG5vbmUgYXJlIHBy
b3ZpZGVkPyBXb3VsZAo+IGl0IGJlIGJldHRlciB0byBiZSBleHBsaWNpdD8KPgo+IFRoYW5rcyBm
b3IgdGhpcywgSSd2ZSBiZWVuIG1lYW5pbmcgdG8gZG8gdGhpcyBmb3JldmVyLi4uCgpIbSBJIGd1
ZXNzIGV4cGxpY2l0IG1pZ2h0IGJlIGJldHRlciwgd2hhdCBhYm91dCB0aGlzPwotLS0tLS04PC0t
LS0tLS0KV2hlbiBhIGJyYW5jaCBjYW4gYmUgZmFzdC1mb3J3YXJkZWQsIHRyeSBpdCBmaXJzdCBi
ZWZvcmUgcmViYXNpbmcuClRoaXMgd2lsbCBwcmV2ZW50IGEgd2hvbGUgbG90IG9mIGVkaXRvciB3
aW5kb3dzIG9wZW5pbmcgd2l0aCAnbm9vcCcKd2hlbiBydW5uaW5nIGRpbSB1Yi4KClNpZ25lZC1v
ZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5j
b20+Ci0tLQpkaWZmIC0tZ2l0IGEvZGltIGIvZGltCmluZGV4IGZhNjNhZThjOGE3OS4uZTA1NTFh
Y2U1NGU0IDEwMDc1NQotLS0gYS9kaW0KKysrIGIvZGltCkBAIC0xMjg2LDkgKzEyODYsNyBAQCBm
dW5jdGlvbiBkaW1fdXBkYXRlX2JyYW5jaGVzCiAJCXJlcG89YGJyYW5jaF90b19yZXBvICRicmFu
Y2hgCiAJCXJlbW90ZT1gcmVwb190b19yZW1vdGUgJHJlcG9gCiAKLQkJaWYgZ2l0IGRpZmYgLS1x
dWlldCAkcmVtb3RlLyRicmFuY2g7IHRoZW4KLQkJCSREUlkgZ2l0IHJlYmFzZQotCQllbHNlCisJ
CWlmICEgJERSWSBnaXQgbWVyZ2UgLS1mZi1vbmx5ICRyZW1vdGUvJGJyYW5jaDsgdGhlbgogCQkJ
JERSWSBnaXQgcmViYXNlIC1pCiAJCWZpCiAJZG9uZQoKX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA
bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt
YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==