|author||Carl Worth <firstname.lastname@example.org>||2014-07-30 19:20:51 -0700|
|committer||Carl Worth <email@example.com>||2014-07-30 22:09:46 -0700|
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')
1 files changed, 11 insertions, 0 deletions
diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
index 80df7dc3da4..ca1bc8698f1 100644
@@ -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).
+# 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?).