diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-02-14 20:37:26 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-02-14 20:37:26 +0000 |
| commit | a141319b555edda2184514fb11c0d23eb8075a7b (patch) | |
| tree | 2d0abd13f598f02cbf152412ff998bac0cd63804 /lanodanOverlay.txt | |
| parent | 2021-02-14T20:15:01Z (diff) | |
| download | repos-a141319b555edda2184514fb11c0d23eb8075a7b.tar.gz repos-a141319b555edda2184514fb11c0d23eb8075a7b.tar.bz2 repos-a141319b555edda2184514fb11c0d23eb8075a7b.zip | |
2021-02-14T20:30:01Z
Diffstat (limited to 'lanodanOverlay.txt')
| -rw-r--r-- | lanodanOverlay.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/lanodanOverlay.txt b/lanodanOverlay.txt index bdfea098280b..3efcfe8dc628 100644 --- a/lanodanOverlay.txt +++ b/lanodanOverlay.txt @@ -14,9 +14,21 @@ {'type': 'git', 'uri': 'git://hacktivis.me/git/overlay.git'}, {'type': 'git', 'uri': 'git://gitlab.com/lanodan/overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync lanodanOverlay -Cloning into '/var/lib/repo-mirror-ci/sync/lanodanOverlay'... +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 lanodanOverlay *** synced lanodanOverlay * Sync succeeded |