From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jani Nikula <jani.nikula@linux.intel.com>
Subject: Re: [PATCH] dim: Try git-merge --ff-only before
	git-rebase	-i when updating branches.
Date: Wed, 07 Dec 2016 11:33:53 +0200
Message-ID: <87h96gxev2.fsf@intel.com>
References: <1481017719-5463-1-git-send-email-maarten.lankhorst@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 mga06.intel.com (mga06.intel.com [134.134.136.31])
 by gabe.freedesktop.org (Postfix) with ESMTPS id C0C056E03C
 for <intel-gfx@lists.freedesktop.org>; Wed,  7 Dec 2016 09:33:55 +0000 (UTC)
In-Reply-To: <1481017719-5463-1-git-send-email-maarten.lankhorst@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

T24gVHVlLCAwNiBEZWMgMjAxNiwgTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0
QGxpbnV4LmludGVsLmNvbT4gd3JvdGU6Cj4gV2hlbiBhIGJyYW5jaCBjYW4gYmUgZmFzdC1mb3J3
YXJkZWQsIHRyeSBpdCBmaXJzdCBiZWZvcmUgcmViYXNpbmcuCj4gVGhpcyB3aWxsIHByZXZlbnQg
YSB3aG9sZSBsb3Qgb2YgZWRpdG9yIHdpbmRvd3Mgb3BlbmluZyB3aXRoICdub29wJwo+IHdoZW4g
cnVubmluZyBkaW0gdWIuCj4KPiBTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFh
cnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgo+IC0tLQo+ICBkaW0gfCA0ICstLS0KPiAg
MSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAzIGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAt
LWdpdCBhL2RpbSBiL2RpbQo+IGluZGV4IGZhNjNhZThjOGE3OS4uYjJlNjg0MWUyM2Q3IDEwMDc1
NQo+IC0tLSBhL2RpbQo+ICsrKyBiL2RpbQo+IEBAIC0xMjg2LDkgKzEyODYsNyBAQCBmdW5jdGlv
biBkaW1fdXBkYXRlX2JyYW5jaGVzCj4gIAkJcmVwbz1gYnJhbmNoX3RvX3JlcG8gJGJyYW5jaGAK
PiAgCQlyZW1vdGU9YHJlcG9fdG9fcmVtb3RlICRyZXBvYAo+ICAKPiAtCQlpZiBnaXQgZGlmZiAt
LXF1aWV0ICRyZW1vdGUvJGJyYW5jaDsgdGhlbgo+IC0JCQkkRFJZIGdpdCByZWJhc2UKPiAtCQll
bHNlCj4gKwkJaWYgISAkRFJZIGdpdCBtZXJnZSAtLWZmLW9ubHkgOyB0aGVuCgpXaGF0IGRvZXMg
aXQgYXNzdW1lIGZvciBicmFuY2hlcyB0byBtZXJnZSB3aGVuIG5vbmUgYXJlIHByb3ZpZGVkPyBX
b3VsZAppdCBiZSBiZXR0ZXIgdG8gYmUgZXhwbGljaXQ/CgpUaGFua3MgZm9yIHRoaXMsIEkndmUg
YmVlbiBtZWFuaW5nIHRvIGRvIHRoaXMgZm9yZXZlci4uLgoKQlIsCkphbmkuCgo+ICAJCQkkRFJZ
IGdpdCByZWJhc2UgLWkKPiAgCQlmaQo+ICAJZG9uZQoKLS0gCkphbmkgTmlrdWxhLCBJbnRlbCBP
cGVuIFNvdXJjZSBUZWNobm9sb2d5IENlbnRlcgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0
cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s
aXN0aW5mby9pbnRlbC1nZngK