diff options
Diffstat (limited to 'bitcoin.txt')
| -rw-r--r-- | bitcoin.txt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/bitcoin.txt b/bitcoin.txt index 9bc2d60343a5..863ed2a0364b 100644 --- a/bitcoin.txt +++ b/bitcoin.txt @@ -8,7 +8,6 @@ 'source': [{'type': 'git', 'uri': 'https://gitlab.com/bitcoin/gentoo.git'}], 'status': 'unofficial'} $ pmaint sync bitcoin -WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). *** syncing bitcoin warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following @@ -23,7 +22,14 @@ preference for all repositories. You can also pass --rebase, --no-rebase, or --ff-only on the command line to override the configured default per invocation. -Already up to date. +From https://gitlab.com/bitcoin/gentoo + 4a5ea3e..b49d42c master -> origin/master +Updating 4a5ea3e..b49d42c +Fast-forward + net-p2p/c-lightning/Manifest | 2 +- + .../{c-lightning-0.10.0_rc1.ebuild => c-lightning-0.10.0_rc2.ebuild} | 0 + 2 files changed, 1 insertion(+), 1 deletion(-) + rename net-p2p/c-lightning/{c-lightning-0.10.0_rc1.ebuild => c-lightning-0.10.0_rc2.ebuild} (100%) *** synced bitcoin * Sync succeeded $ git log --format=%ci -1 |