diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-18 13:05:17 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-18 13:05:17 +0000 |
| commit | 34daea1b09df66e90b7f10d250a37897d098910c (patch) | |
| tree | 5ac293e7ace67f7396b25cdab337a45923f2bd8e /awesome.txt | |
| parent | 2020-11-18T12:30:01Z (diff) | |
| download | repos-34daea1b09df66e90b7f10d250a37897d098910c.tar.gz repos-34daea1b09df66e90b7f10d250a37897d098910c.tar.bz2 repos-34daea1b09df66e90b7f10d250a37897d098910c.zip | |
2020-11-18T13:00:01Z
Diffstat (limited to 'awesome.txt')
| -rw-r--r-- | awesome.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/awesome.txt b/awesome.txt index be3e8cdd250c..117c63508bcc 100644 --- a/awesome.txt +++ b/awesome.txt @@ -8,9 +8,21 @@ 'source': [{'type': 'git', 'uri': 'https://gitlab.awesome-it.de/overlays/awesome.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync awesome -Cloning into '/var/lib/repo-mirror-ci/sync/awesome'... +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 awesome *** synced awesome * Sync succeeded |