diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-23 13:06:50 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-23 13:06:50 +0000 |
| commit | e33cd2177cdc87b735a38a633f638b6c1b13e406 (patch) | |
| tree | 841c1fce6f14cf728b2a4c07d154fdcce60848a5 /emacs.txt | |
| parent | 2020-10-23T12:00:01Z (diff) | |
| download | repos-e33cd2177cdc87b735a38a633f638b6c1b13e406.tar.gz repos-e33cd2177cdc87b735a38a633f638b6c1b13e406.tar.bz2 repos-e33cd2177cdc87b735a38a633f638b6c1b13e406.zip | |
2020-10-23T13:00:01Z
Diffstat (limited to 'emacs.txt')
| -rw-r--r-- | emacs.txt | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/emacs.txt b/emacs.txt index 8f5b757d146d..5a28747499b0 100644 --- a/emacs.txt +++ b/emacs.txt @@ -16,16 +16,21 @@ {'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/repo/proj/emacs.git'}], 'status': 'official'} - * Adding new repository $ pmaint sync emacs -WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -Cloning into '/var/lib/repo-mirror-ci/sync/emacs'... +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 emacs *** synced emacs * Sync succeeded |