diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-09 18:05:23 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-09 18:05:23 +0000 |
| commit | 25240d7eeedb8039ef07804cbda69d63a73278ab (patch) | |
| tree | b87e74479ff496d6a6a186835b93edebf721fa13 /awesome.txt | |
| parent | 2020-11-09T17:30:01Z (diff) | |
| download | repos-25240d7eeedb8039ef07804cbda69d63a73278ab.tar.gz repos-25240d7eeedb8039ef07804cbda69d63a73278ab.tar.bz2 repos-25240d7eeedb8039ef07804cbda69d63a73278ab.zip | |
2020-11-09T18: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 |