diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-18 23:35:15 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-18 23:35:15 +0000 |
| commit | fa8d2817b98ee0c0ad1e0b1699bf418a699f7087 (patch) | |
| tree | dbf8527c73820d2c4ddf321ea6690aa5f2f57938 /jkolo.txt | |
| parent | 2020-11-18T23:00:01Z (diff) | |
| download | repos-fa8d2817b98ee0c0ad1e0b1699bf418a699f7087.tar.gz repos-fa8d2817b98ee0c0ad1e0b1699bf418a699f7087.tar.bz2 repos-fa8d2817b98ee0c0ad1e0b1699bf418a699f7087.zip | |
2020-11-18T23:30:01Z
Diffstat (limited to 'jkolo.txt')
| -rw-r--r-- | jkolo.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/jkolo.txt b/jkolo.txt index 795197eefab3..acd5b54df1c5 100644 --- a/jkolo.txt +++ b/jkolo.txt @@ -8,9 +8,21 @@ 'source': [{'type': 'git', 'uri': 'https://git.kolosowscy.pl/jurek/gentoo-overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync jkolo -Cloning into '/var/lib/repo-mirror-ci/sync/jkolo'... +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 jkolo *** synced jkolo * Sync succeeded |