diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-23 17:35:53 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-23 17:35:53 +0000 |
commit | be3def55c8643a8c9b9683f7c826e3601005ada9 (patch) | |
tree | f04f43837164b4c91e5731a7f9200d762fcf9fb7 /AzP.txt | |
parent | 2020-10-23T14:30:01Z (diff) | |
download | repos-be3def55c8643a8c9b9683f7c826e3601005ada9.tar.gz repos-be3def55c8643a8c9b9683f7c826e3601005ada9.tar.bz2 repos-be3def55c8643a8c9b9683f7c826e3601005ada9.zip |
2020-10-23T17:30:01Z
Diffstat (limited to 'AzP.txt')
-rw-r--r-- | AzP.txt | 16 |
1 files changed, 14 insertions, 2 deletions
@@ -12,9 +12,21 @@ {'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/user/AzP.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync AzP -Cloning into '/var/lib/repo-mirror-ci/sync/AzP'... +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 AzP *** synced AzP * Sync succeeded |