diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-01-23 19:32:46 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-01-23 19:32:46 +0000 |
| commit | 5b955ad4eff0570d9b190703038be4a69ce07f4a (patch) | |
| tree | c17467f7851d8424922835470d3f9297095c1942 /robertgzr.txt | |
| parent | 2021-01-23T18:00:01Z (diff) | |
| download | repos-5b955ad4eff0570d9b190703038be4a69ce07f4a.tar.gz repos-5b955ad4eff0570d9b190703038be4a69ce07f4a.tar.bz2 repos-5b955ad4eff0570d9b190703038be4a69ce07f4a.zip | |
2021-01-23T19:00:01Z
Diffstat (limited to 'robertgzr.txt')
| -rw-r--r-- | robertgzr.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/robertgzr.txt b/robertgzr.txt index 4fb7700841ad..537ebd909bcf 100644 --- a/robertgzr.txt +++ b/robertgzr.txt @@ -9,9 +9,21 @@ 'source': [{'type': 'git', 'uri': 'https://git.sr.ht/~robertgzr/portage'}, {'type': 'git', 'uri': 'ssh://git@git.sr.ht:~robertgzr/portage'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync robertgzr -Cloning into '/var/lib/repo-mirror-ci/sync/robertgzr'... +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 robertgzr *** synced robertgzr * Sync succeeded |