diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-01-08 14:04:57 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-01-08 14:04:57 +0000 |
| commit | 796baa55419ef285ade039b654169ef235dd38d0 (patch) | |
| tree | 485533b1c4cfcc3b879fd0a2cff4c9525a22ce2d /phackerlay.txt | |
| parent | 2021-01-08T13:30:01Z (diff) | |
| download | repos-796baa55419ef285ade039b654169ef235dd38d0.tar.gz repos-796baa55419ef285ade039b654169ef235dd38d0.tar.bz2 repos-796baa55419ef285ade039b654169ef235dd38d0.zip | |
2021-01-08T14:00:01Z
Diffstat (limited to 'phackerlay.txt')
| -rw-r--r-- | phackerlay.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/phackerlay.txt b/phackerlay.txt index 88e81f92cb48..5499bb7d3398 100644 --- a/phackerlay.txt +++ b/phackerlay.txt @@ -9,9 +9,21 @@ 'source': [{'type': 'git', 'uri': 'https://gitlab.phys-el.ru/ustinov/phackerlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync phackerlay -Cloning into '/var/lib/repo-mirror-ci/sync/phackerlay'... +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 phackerlay *** synced phackerlay * Sync succeeded |