diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-11 09:35:13 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-11 09:35:13 +0000 |
| commit | c583804280b6e6d8c621962a9945737f5051d605 (patch) | |
| tree | b5762354875b577b0532704a68f086d93cc33670 /smaeul.txt | |
| parent | 2020-11-11T09:00:01Z (diff) | |
| download | repos-c583804280b6e6d8c621962a9945737f5051d605.tar.gz repos-c583804280b6e6d8c621962a9945737f5051d605.tar.bz2 repos-c583804280b6e6d8c621962a9945737f5051d605.zip | |
2020-11-11T09:30:01Z
Diffstat (limited to 'smaeul.txt')
| -rw-r--r-- | smaeul.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/smaeul.txt b/smaeul.txt index 2e0693438a27..65eb36c8722d 100644 --- a/smaeul.txt +++ b/smaeul.txt @@ -12,9 +12,21 @@ {'type': 'git', 'uri': 'git+ssh://git@github.com/smaeul/portage-overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync smaeul -Cloning into '/var/lib/repo-mirror-ci/sync/smaeul'... +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 smaeul *** synced smaeul * Sync succeeded |