summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2014-07-30 19:20:51 -0700
committerCarl Worth <cworth@cworth.org>2014-07-30 22:09:46 -0700
commit490d8ddf879300cdab44d344f0e5f72b3400b4cc (patch)
treee36696a9d195dc52a38717170455ebc3e5b17f64 /bin
parentb9c5a8f869ae76ba560db88523779eae9014b826 (diff)
cherry-ignore: Ignore a few patches picked in the previous stable release
I don't know what happened here, but these three commits were picked earlier, but the commit IDs referenced in their commit messages do not currently appear in the master branch, (perhaps a force-push occurred?). Anyway, we can ignore these now.
Diffstat (limited to 'bin')
-rw-r--r--bin/.cherry-ignore11
1 files changed, 11 insertions, 0 deletions
diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
index 80df7dc3da4..ca1bc8698f1 100644
--- a/bin/.cherry-ignore
+++ b/bin/.cherry-ignore
@@ -5,3 +5,14 @@ e6967270c75a5b669152127bb7a746d55f4407a6 i965: Fix depth (array slices) computat
# This patch didn't have enough in the commit message to convince me it
# is a bug fix, (email sent to author asking for more information).
41d759d076737f94976f5294b734dbc437a12bae
+
+# These patch were already cherry-picked before the 10.2.4 release.
+#
+# But get-pick-list.sh doesn't realize that because the commit messages for
+# these on the stable branch reference commit IDs that don't actually appear
+# on master. I'm not sure what happened, (perhaps master was force-pushed at
+# some point?).
+2eaf3f670fea4ce4466340141244e41a45542c13
+e5adc560cc8544200faa3e04504202839626ab37
+cf1b5eee7f36af29d1d5caba3538ad4985e51f81
+