diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-05-08 08:24:14 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-05-08 08:24:21 -0400 |
| commit | bbb7119ca8354a85d25cfd07b71729d13328862d (patch) | |
| tree | 86fcf060a34da8e598cbf50350451ca259ca31e4 | |
| parent | ef802ef5d694f01111ae7892a2d1034486f61819 (diff) | |
| parent | a3592c91a2d39efe80eb5fe81511da12728d2687 (diff) | |
Merge #15978: .gitignore: Don't ignore depends patches
a3592c91a2 .gitignore: Don't ignore depends patches (Carl Dong)
Pull request description:
Ignoring patches might be useful for those who use `git format-patch` often, but in our depends folder we **_want_** to keep track of our patches.
ACKs for commit a3592c:
practicalswift:
utACK a3592c91a2d39efe80eb5fe81511da12728d2687
laanwj:
utACK a3592c91a2d39efe80eb5fe81511da12728d2687
jonasschnelli:
utACK a3592c91a2d39efe80eb5fe81511da12728d2687
fanquake:
utACK a3592c9
Tree-SHA512: 439479cc2ff05335c3d21551a23b34ef2f8a4d0eb05085d2422c2c8d7d7035f529b83dc4056f18cb96234d6fa74075adaa14f0e5fb4c99e6189a4af9078fd28e
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index be784024a0..3ebf00ed52 100644 --- 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 |