diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-04 11:05:12 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-04 11:05:12 +0000 |
| commit | 5303234e945157dd0bcb2772f21bb3bc0c35af32 (patch) | |
| tree | d53499d6a8149334a2939735b39bd1afdc556333 /distros.txt | |
| parent | 2020-10-04T10:30:01Z (diff) | |
| download | repos-5303234e945157dd0bcb2772f21bb3bc0c35af32.tar.gz repos-5303234e945157dd0bcb2772f21bb3bc0c35af32.tar.bz2 repos-5303234e945157dd0bcb2772f21bb3bc0c35af32.zip | |
2020-10-04T11:00:01Z
Diffstat (limited to 'distros.txt')
| -rw-r--r-- | distros.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/distros.txt b/distros.txt index 28f81e5920e4..8f378df4fb06 100644 --- a/distros.txt +++ b/distros.txt @@ -6,9 +6,21 @@ 'source': [{'type': 'git', 'uri': 'git://git.calculate-linux.org/calculate/distros-overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync distros -Cloning into '/var/lib/repo-mirror-ci/sync/distros'... +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 distros *** synced distros * Sync succeeded |