diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-03 12:05:15 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-03 12:05:15 +0000 |
| commit | fecab6e6a0e7c22bf98e7c2219be0c47cf377b40 (patch) | |
| tree | 12a85335042fe1f616e8bd42777acaad8bbdfcb5 /mrhappyhof-gentoo.txt | |
| parent | 2020-11-03T11:30:01Z (diff) | |
| download | repos-fecab6e6a0e7c22bf98e7c2219be0c47cf377b40.tar.gz repos-fecab6e6a0e7c22bf98e7c2219be0c47cf377b40.tar.bz2 repos-fecab6e6a0e7c22bf98e7c2219be0c47cf377b40.zip | |
2020-11-03T12:00:01Z
Diffstat (limited to 'mrhappyhof-gentoo.txt')
| -rw-r--r-- | mrhappyhof-gentoo.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/mrhappyhof-gentoo.txt b/mrhappyhof-gentoo.txt index 30380b67e95f..c1a3abb2f54d 100644 --- a/mrhappyhof-gentoo.txt +++ b/mrhappyhof-gentoo.txt @@ -11,9 +11,21 @@ {'type': 'git', 'uri': 'git+ssh://git@github.com/mrhappyhof/mrhappyhof-gentoo.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync mrhappyhof-gentoo -Cloning into '/var/lib/repo-mirror-ci/sync/mrhappyhof-gentoo'... +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 mrhappyhof-gentoo *** synced mrhappyhof-gentoo * Sync succeeded |