aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfanquake <fanquake@gmail.com>2019-08-04 09:00:33 +0800
committerfanquake <fanquake@gmail.com>2019-08-04 09:00:58 +0800
commite55444a2a8a2b4a378e6d42b7bf73d13492a5716 (patch)
tree23f4ce25343e4772f492b01dc15634ab88a75618
parent3a3d8b83571205b8329d4ee25537e3cc4397c3b8 (diff)
parent0a4e4a05ea33171797289a0c4bdfdc43d46e160f (diff)
Merge #16534: build: add Qt Creator Makefile.am.user to .gitignore
0a4e4a05ea33171797289a0c4bdfdc43d46e160f [build] .gitignore add Qt Creator Makefile.am.user (Peter Bushnell) Pull request description: Opening Bitcoin with Qt Creator via the Makefile.am generates a Makefile.am.user. Would be handy to have this file ignored. Looking around I can see this file has snuck into a few downstream projects. I do personally find myself editing commits to remove this file when I've not been paying attention. There's got to have been a few PRs with this file accidentally attached. ACKs for top commit: promag: ACK 0a4e4a05ea33171797289a0c4bdfdc43d46e160f. practicalswift: ACK 0a4e4a05ea33171797289a0c4bdfdc43d46e160f -- diff looks correct fanquake: ACK 0a4e4a05ea33171797289a0c4bdfdc43d46e160f - Something like this might be better in your local .gitignore_global, but we do have a section on Qt Creator in the docs, so I guess this is fine. Tree-SHA512: 282fd37ec6b313bf86ebe85a42e7f05b14969c683d32f01d2561f4e15d90a2e89f4d0e3c227cb3350684bcae21d178ea343edb32c4c1d33f4849246222c9b8d5
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index cec1fb3dec..edc683e48b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -91,6 +91,9 @@ bitcoin-qt
Bitcoin-Qt.app
background.tiff*
+# Qt Creator
+Makefile.am.user
+
# Unit-tests
Makefile.test
bitcoin-qt_test