diff options
| author | Dylan Baker <[email protected]> | 2019-09-18 09:03:55 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2019-09-23 11:08:24 -0700 |
| commit | 6ee069f94ada4052c0e0bbcd481ec99a06d41db3 (patch) | |
| tree | 72e31f5a5c092955c3d1fbbf04603ad443ea3f7c | |
| parent | d0832208798987d2be9ba6acd2dbf1d996d7905a (diff) | |
cherry-ignore: Add patches
| -rw-r--r-- | bin/.cherry-ignore | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore index 392fbe6e5c0..d67458f3073 100644 --- a/bin/.cherry-ignore +++ b/bin/.cherry-ignore @@ -4,3 +4,15 @@ da5ebe30105f70e3520ce3ae145793b755552569 # Jason doesn't want this applied to 19.2 (it's a revert) d15fe8ca8262d502435c4f83985ac414f950bc5f + +# This doesn't apply to 19.2 +f833b4cada07b746a10ffa4d93fcd821920c3cb1 +d2db43fcad6a2ea2070ff5f7884411f4b7d3925c +66f2aa6ccd0b226eebe2c1a46281160b0a54d522 + +# The author requested that this not be applied to 19.2 +dcc0e23438f3e5929c2ef74d57e8207be25ecb41 + +# This doesn't apply cleanly, and no one really cares about this file on stable +# branches anyway. +bcd9224728dcb8d8fe4bcddc4bd9b2c36fcfe9dd |