Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gitignore: plist and dat #15809

Merged
merged 2 commits into from Apr 15, 2019

Conversation

Projects
None yet
4 participants
@jamesob
Copy link
Member

commented Apr 12, 2019

Ignore anything ending in .dat and files generated by clang-check.

@fanquake

This comment has been minimized.

Copy link
Member

commented Apr 12, 2019

utACK 17be9e0

@laanwj laanwj merged commit 17be9e0 into bitcoin:master Apr 15, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Apr 15, 2019

Merge #15809: gitignore: plist and dat
17be9e0 gitignore: add *.plist (clang-check) (James O'Beirne)
e7acf44 gitignore: add *.dat (James O'Beirne)

Pull request description:

  Ignore anything ending in `.dat` and files generated by clang-check.

ACKs for commit 17be9e:
  fanquake:
    utACK 17be9e0

Tree-SHA512: 92854ad6fe1e7fd1180f2c809aeed802a9e95c90bd1faeca884d27dba7cacd34a6ececa2218f681433bb69a194efb932ff43b501ec1ccccb56b7d4e41facafe6
@laanwj

This comment has been minimized.

Copy link
Member

commented Apr 15, 2019

utACK 17be9e0

some days I wish, that like cmake, autoconf would strongly encourage building out-of-tree, so that not so many random build artifacts end up in the git tree—this is always a growing set

@laanwj laanwj added this to the 0.18.0 milestone Apr 15, 2019

fanquake added a commit to fanquake/bitcoin that referenced this pull request Apr 15, 2019

gitignore: add *.dat
Github-Pull: bitcoin#15809
Rebased-From: e7acf44

fanquake added a commit to fanquake/bitcoin that referenced this pull request Apr 15, 2019

@fanquake fanquake referenced this pull request Apr 15, 2019

Merged

[0.18] doc backports #15818

@fanquake

This comment has been minimized.

Copy link
Member

commented Apr 15, 2019

Backported in #15818.

@promag

This comment has been minimized.

Copy link
Member

commented Apr 15, 2019

Running git status while make is running shows untracked files *.o.tmp. This one could be added too.

fanquake added a commit to fanquake/bitcoin that referenced this pull request Apr 16, 2019

gitignore: add *.dat
Github-Pull: bitcoin#15809
Rebased-From: e7acf44

fanquake added a commit to fanquake/bitcoin that referenced this pull request Apr 16, 2019

laanwj added a commit that referenced this pull request Apr 18, 2019

Merge #15818: [0.18] doc backports
a644780 doc: Clarify RPC versioning (MarcoFalke)
194226f doc: describe onlynet option in doc/tor.md (Jon Atack)
6d2448c doc/dependencies: Fix typo libsrvg->librsvg (Luke Dashjr)
9c572e3 doc: mention creating application support bitcoin folder on OSX (Jack Mallers)
c69138a gitignore: add *.plist (clang-check) (James O'Beirne)
8f7cfb0 gitignore: add *.dat (James O'Beirne)

Pull request description:

  Backports #15684, #15792, #15802,  #15809 to the `0.18` branch.

ACKs for commit a64478:

Tree-SHA512: 6ed524a7b94242f8a738710d4321b98b9e80d6625d384fd83280b38fcb6bb8c468bcec1d980789ad2f4c91a5629ffe5c5314a7353181f08884c5a081840431cc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.