diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-02-10 20:22:31 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-02-10 20:22:31 +0000 |
| commit | c1f666d7bb07fd8895f4f8a8b77b810ac7aa6bb3 (patch) | |
| tree | c6f40d142214f551295d520f64138341ba176d30 /hexedit-overlay.txt | |
| parent | 2021-02-10T20:00:01Z (diff) | |
| download | repos-c1f666d7bb07fd8895f4f8a8b77b810ac7aa6bb3.tar.gz repos-c1f666d7bb07fd8895f4f8a8b77b810ac7aa6bb3.tar.bz2 repos-c1f666d7bb07fd8895f4f8a8b77b810ac7aa6bb3.zip | |
2021-02-10T20:15:01Z
Diffstat (limited to 'hexedit-overlay.txt')
| -rw-r--r-- | hexedit-overlay.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/hexedit-overlay.txt b/hexedit-overlay.txt index 0732fe6c9456..e764f59b2cbb 100644 --- a/hexedit-overlay.txt +++ b/hexedit-overlay.txt @@ -9,9 +9,21 @@ 'source': [{'type': 'git', 'uri': 'https://git.ifproject.ru/hexedit/gentoo-overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync hexedit-overlay -Cloning into '/var/lib/repo-mirror-ci/sync/hexedit-overlay'... +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 hexedit-overlay *** synced hexedit-overlay * Sync succeeded |