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
This commit is contained in:
MarcoFalke 2019-05-08 08:24:14 -04:00 committed by xdustinface
parent 0180cdd729
commit 79a913830e

6
.gitignore vendored
View File

@ -63,8 +63,6 @@ libconftest.dylib*
*.pyc *.pyc
*.o *.o
*.o-* *.o-*
*.patch
!depends/patches/*/*.patch
*.a *.a
*.pb.cc *.pb.cc
*.pb.h *.pb.h
@ -76,6 +74,10 @@ libconftest.dylib*
*.json.h *.json.h
*.raw.h *.raw.h
# Only ignore unexpected patches
*.patch
!depends/patches/*.patch
#libtool object files #libtool object files
*.lo *.lo
*.la *.la