summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2019-05-28 11:24:00 -0700
committerDylan Baker <dylan@pnwbakers.com>2019-05-28 11:24:34 -0700
commitf6fc9f6a2c2491cec59e305d087a264d7aebaeea (patch)
tree851ef4285e9e49abca56b6adae556d1f27975239
parentc65c77074f37e7ccca55bed5408295f1df4e27a1 (diff)
downloadmesa-f6fc9f6a2c2491cec59e305d087a264d7aebaeea.tar.gz
cherry-ignore: Add a commit that was manually backported
-rw-r--r--bin/.cherry-ignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
index 6c3f01790e0..96d82ac5e06 100644
--- a/bin/.cherry-ignore
+++ b/bin/.cherry-ignore
@@ -38,3 +38,7 @@ d2aa65eb1892f7b300ac24560f9dbda6b600b5a7
78e35df52aa2f7d770f929a0866a0faa89c261a9
0f1b070bad34c46c4bcc6c679fa533bf6b4b79e5
ad2b4aa37806779bdfc15d704940136c3db21eb4
+
+# This was manually rebased and the script doesn't understand that for some
+# reason
+cb7c9b2a9352cc73a2d3becc0427c53c8baf153a