diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-22 23:05:23 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-22 23:05:23 +0000 |
| commit | 907359aef54d12b3358297e25802e842adf9fa17 (patch) | |
| tree | ae582b51b2e8fc9398cd96103547ed4c10260721 /interactive-fiction.txt | |
| parent | 2020-11-22T22:30:01Z (diff) | |
| download | repos-907359aef54d12b3358297e25802e842adf9fa17.tar.gz repos-907359aef54d12b3358297e25802e842adf9fa17.tar.bz2 repos-907359aef54d12b3358297e25802e842adf9fa17.zip | |
2020-11-22T23:00:01Z
Diffstat (limited to 'interactive-fiction.txt')
| -rw-r--r-- | interactive-fiction.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/interactive-fiction.txt b/interactive-fiction.txt index 80058e48b1d8..86c9de3915f7 100644 --- a/interactive-fiction.txt +++ b/interactive-fiction.txt @@ -7,9 +7,21 @@ 'source': [{'type': 'git', 'uri': 'git://repo.or.cz/gentoo-interactive-fiction.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync interactive-fiction -Cloning into '/var/lib/repo-mirror-ci/sync/interactive-fiction'... +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 interactive-fiction *** synced interactive-fiction * Sync succeeded |