diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-03 22:10:16 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-03 22:10:16 +0000 |
| commit | 9be2bdcaa7357829411ae89e5e338e27d4ccc29c (patch) | |
| tree | 22756c2ec50d253d71f2cacf1239a243a667fa96 /gitlab.txt | |
| parent | 2020-10-03T21:30:01Z (diff) | |
| download | repos-9be2bdcaa7357829411ae89e5e338e27d4ccc29c.tar.gz repos-9be2bdcaa7357829411ae89e5e338e27d4ccc29c.tar.bz2 repos-9be2bdcaa7357829411ae89e5e338e27d4ccc29c.zip | |
2020-10-03T22:00:01Z
Diffstat (limited to 'gitlab.txt')
| -rw-r--r-- | gitlab.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/gitlab.txt b/gitlab.txt index 13519e3e6150..6e8aed52fbf4 100644 --- a/gitlab.txt +++ b/gitlab.txt @@ -8,9 +8,21 @@ 'source': [{'type': 'git', 'uri': 'https://gitlab.awesome-it.de/overlays/gitlab.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync gitlab -Cloning into '/var/lib/repo-mirror-ci/sync/gitlab'... +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 gitlab *** synced gitlab * Sync succeeded |