diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-22 14:50:34 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-22 14:50:34 +0000 |
| commit | 6142d7c679f28288cacba6a221e0e9e853926877 (patch) | |
| tree | a45131a5c086e4fe859f685d34e7769dd084fd65 /awesome.txt | |
| parent | 2021-03-22T14:30:01Z (diff) | |
| download | repos-6142d7c679f28288cacba6a221e0e9e853926877.tar.gz repos-6142d7c679f28288cacba6a221e0e9e853926877.tar.bz2 repos-6142d7c679f28288cacba6a221e0e9e853926877.zip | |
2021-03-22T14:45: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 c9e05fefc453..0b9948c73716 100644 --- a/awesome.txt +++ b/awesome.txt @@ -8,10 +8,22 @@ 'source': [{'type': 'git', 'uri': 'https://gitlab.awesome-it.de/overlays/awesome.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync awesome *** syncing 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. *** synced awesome * Sync succeeded $ git log --format=%ci -1 |