diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-12-15 10:06:07 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-12-15 10:06:07 +0000 |
| commit | 634cb3a1899b28a753b87070397aeb86b8020b50 (patch) | |
| tree | 6d5d76cccda4fee7d6404b5df70f89bd96e7fe09 /nitratesky.txt | |
| parent | 2020-12-15T09:30:01Z (diff) | |
| download | repos-634cb3a1899b28a753b87070397aeb86b8020b50.tar.gz repos-634cb3a1899b28a753b87070397aeb86b8020b50.tar.bz2 repos-634cb3a1899b28a753b87070397aeb86b8020b50.zip | |
2020-12-15T10:00:01Z
Diffstat (limited to 'nitratesky.txt')
| -rw-r--r-- | nitratesky.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/nitratesky.txt b/nitratesky.txt index acb5f54cec81..d5efbf890444 100644 --- a/nitratesky.txt +++ b/nitratesky.txt @@ -11,9 +11,21 @@ {'type': 'git', 'uri': 'git+ssh://git@github.com/VTimofeenko/nitratesky.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync nitratesky -Cloning into '/var/lib/repo-mirror-ci/sync/nitratesky'... +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 nitratesky *** synced nitratesky * Sync succeeded |