diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-02-24 23:37:08 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-02-24 23:37:08 +0000 |
| commit | 53a7b992985d88c100f53f56382a6e63e6633dee (patch) | |
| tree | 890b4c9f2d0106081e2445d06ca655fc6e8ee18b /zscheile.txt | |
| parent | 2021-02-24T23:15:01Z (diff) | |
| download | repos-53a7b992985d88c100f53f56382a6e63e6633dee.tar.gz repos-53a7b992985d88c100f53f56382a6e63e6633dee.tar.bz2 repos-53a7b992985d88c100f53f56382a6e63e6633dee.zip | |
2021-02-24T23:30:01Z
Diffstat (limited to 'zscheile.txt')
| -rw-r--r-- | zscheile.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/zscheile.txt b/zscheile.txt index 4b4053f8ea90..a9ef1bbda429 100644 --- a/zscheile.txt +++ b/zscheile.txt @@ -13,9 +13,21 @@ {'type': 'git', 'uri': 'git@github.com:zseri/portage-zscheile.git'}], 'status': 'unofficial'} - * Resetting, sync parameters changed $ pmaint sync zscheile -Cloning into '/var/lib/repo-mirror-ci/sync/zscheile'... +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 zscheile *** synced zscheile * Sync succeeded |