From: Maarten Lankhorst Subject: [PATCH] dim: Try git-merge --ff-only before git-rebase -i when updating branches. Date: Tue, 6 Dec 2016 10:48:39 +0100 Message-ID: <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: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id C90446E0FD for ; Tue, 6 Dec 2016 09:48:44 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org V2hlbiBhIGJyYW5jaCBjYW4gYmUgZmFzdC1mb3J3YXJkZWQsIHRyeSBpdCBmaXJzdCBiZWZvcmUg cmViYXNpbmcuClRoaXMgd2lsbCBwcmV2ZW50IGEgd2hvbGUgbG90IG9mIGVkaXRvciB3aW5kb3dz IG9wZW5pbmcgd2l0aCAnbm9vcCcKd2hlbiBydW5uaW5nIGRpbSB1Yi4KClNpZ25lZC1vZmYtYnk6 IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0t LQogZGltIHwgNCArLS0tCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDMgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZGltIGIvZGltCmluZGV4IGZhNjNhZThjOGE3OS4uYjJlNjg0 MWUyM2Q3IDEwMDc1NQotLS0gYS9kaW0KKysrIGIvZGltCkBAIC0xMjg2LDkgKzEyODYsNyBAQCBm dW5jdGlvbiBkaW1fdXBkYXRlX2JyYW5jaGVzCiAJCXJlcG89YGJyYW5jaF90b19yZXBvICRicmFu Y2hgCiAJCXJlbW90ZT1gcmVwb190b19yZW1vdGUgJHJlcG9gCiAKLQkJaWYgZ2l0IGRpZmYgLS1x dWlldCAkcmVtb3RlLyRicmFuY2g7IHRoZW4KLQkJCSREUlkgZ2l0IHJlYmFzZQotCQllbHNlCisJ CWlmICEgJERSWSBnaXQgbWVyZ2UgLS1mZi1vbmx5IDsgdGhlbgogCQkJJERSWSBnaXQgcmViYXNl IC1pCiAJCWZpCiAJZG9uZQotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=