Merge bbb7119 into merged_master (Bitcoin PR #15978)

8paa · Oct 29, 2020 · 83a8811 · 83a8811
2 parents 2eda02d + bbb7119
commit 83a8811
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -62,7 +62,6 @@ src/qt/bitcoin-qt.includes
 *.pyc
 *.o
 *.o-*
-*.patch
 *.a
 *.pb.cc
 *.pb.h
@@ -75,6 +74,10 @@ src/qt/bitcoin-qt.includes
 *.json.h
 *.raw.h
 
+# Only ignore unexpected patches
+*.patch
+!depends/patches/*.patch
+
 #libtool object files
 *.lo
 *.la