diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-16 19:35:15 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-16 19:35:15 +0000 |
| commit | ad7233288fab8372b68e14cee2eb58489d24cb75 (patch) | |
| tree | baa899957d90a354fba44f89810eb73705268de2 /electron.txt | |
| parent | 2020-11-16T19:00:01Z (diff) | |
| download | repos-ad7233288fab8372b68e14cee2eb58489d24cb75.tar.gz repos-ad7233288fab8372b68e14cee2eb58489d24cb75.tar.bz2 repos-ad7233288fab8372b68e14cee2eb58489d24cb75.zip | |
2020-11-16T19:30:01Z
Diffstat (limited to 'electron.txt')
| -rw-r--r-- | electron.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/electron.txt b/electron.txt index 09da1e6a7a4a..72ddd67474dd 100644 --- a/electron.txt +++ b/electron.txt @@ -9,9 +9,21 @@ 'source': [{'type': 'git', 'uri': 'https://github.com/elprans/electron-overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync electron -Cloning into '/var/lib/repo-mirror-ci/sync/electron'... +warning: Pulling without specifying how to reconcile divergent branches is +discouraged. You can squelch this message by running one of the following +commands sometime before your next pull: + + git config pull.rebase false # merge (the default strategy) + git config pull.rebase true # rebase + git config pull.ff only # fast-forward only + +You can replace "git config" with "git config --global" to set a default +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. *** syncing electron *** synced electron * Sync succeeded |