diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-04-20 20:36:54 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-04-20 20:36:54 +0000 |
| commit | 5b3e7cab883bcd5f72cfac5067284e0baff38a2e (patch) | |
| tree | 11becf2c13acf5d0962476d47a9078621e385cce /ryans.txt | |
| parent | 2021-04-20T20:15:01Z (diff) | |
| download | repos-5b3e7cab883bcd5f72cfac5067284e0baff38a2e.tar.gz repos-5b3e7cab883bcd5f72cfac5067284e0baff38a2e.tar.bz2 repos-5b3e7cab883bcd5f72cfac5067284e0baff38a2e.zip | |
2021-04-20T20:30:01Z
Diffstat (limited to 'ryans.txt')
| -rw-r--r-- | ryans.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/ryans.txt b/ryans.txt index 13deef7807a6..c96237f750f2 100644 --- a/ryans.txt +++ b/ryans.txt @@ -8,10 +8,22 @@ 'uri': 'https://github.com/bekcpear/ryans-repos.git'}, {'type': 'git', 'uri': 'git@github.com:bekcpear/ryans-repos.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync ryans *** syncing ryans -Cloning into '/var/lib/repo-mirror-ci/sync/ryans'... +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. *** synced ryans * Sync succeeded $ git log --format=%ci -1 |