diff options
author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-08-19 16:17:06 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-08-19 16:17:26 +0200 |
commit | e00ecb3d7aaee463643e486ca03c318e192b8058 (patch) | |
tree | dbd96c3ab25f0bed21266cd6fccea0d62f1ac8b5 | |
parent | bd62f8d6eed83a3e8249177513e2a29d6af0dc0e (diff) | |
parent | b6e9ff899677770741d94f1cf4f61ebb13fc453f (diff) |
Merge #16611: build: Remove src/obj directory from repository
b6e9ff899677770741d94f1cf4f61ebb13fc453f build: Remove src/obj directory from repository (Wladimir J. van der Laan)
Pull request description:
This directory is automatically created by the build process (in the build target directory, see #16588) and doesn't need to be in the repository nor in the tarballs.
Move associated ignore directive to top-level `.gitignore` file.
ACKs for top commit:
hebasto:
Concept ACK b6e9ff899677770741d94f1cf4f61ebb13fc453f
Tree-SHA512: 5f3f5a0e8f19ecf925eb16cab327c3023b8512731bbaad5875828da7a25fdda1b77f6fbd06c002a383913627dc9b552f09ad27c57bcf0cb020ed3b1f506e5fef
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | src/obj/.gitignore | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index edc683e48b..25710978c3 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,7 @@ libtool src/config/bitcoin-config.h src/config/bitcoin-config.h.in src/config/stamp-h1 +src/obj share/setup.nsi share/qt/Info.plist diff --git a/src/obj/.gitignore b/src/obj/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/src/obj/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore |