Mesa (10.1): cherry-ignore: Ignore two commits.

Carl Worth cworth at kemper.freedesktop.org
Tue Jun 3 20:34:00 UTC 2014


Module: Mesa
Branch: 10.1
Commit: a73894a7ed7aba90dc92bcaae7b01418c8d1b2f1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a73894a7ed7aba90dc92bcaae7b01418c8d1b2f1

Author: Carl Worth <cworth at cworth.org>
Date:   Mon Jun  2 13:03:06 2014 -0700

cherry-ignore: Ignore two commits.

The second of these two is simply a "git revert" of the first. So skipping
both of them gives us the same final result in a simpler way.

---

 bin/.cherry-ignore |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
index 51effb9..12c3e2a 100644
--- a/bin/.cherry-ignore
+++ b/bin/.cherry-ignore
@@ -13,3 +13,9 @@ ac35ded4733883037316d556af596524e5e02535
 
 # And this one was simply a bug fix for the previously-retracted commit
 2bab95973d8ad3a84f62670143d6f26c230d9582
+
+# Here we have a commit, and its subsequent "revert" both proposed within a
+# single window of the stable release. So we can achieve the same final effect
+# by ignoring both of the commits.
+e3cc0d90e14e62a0a787b6c07a6df0f5c84039be
+0d5ec2c615784929be095951f9269773a790a2dd




More information about the mesa-commit mailing list