diff options
Diffstat (limited to '2xsaiko.txt')
| -rw-r--r-- | 2xsaiko.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/2xsaiko.txt b/2xsaiko.txt index 485b34420d5c..6c7e8899d0df 100644 --- a/2xsaiko.txt +++ b/2xsaiko.txt @@ -9,10 +9,22 @@ 'source': [{'type': 'git', 'uri': 'https://git.sr.ht/~dblsaiko/ebuilds'}, {'type': 'git', 'uri': 'git@git.sr.ht:~dblsaiko/ebuilds'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync 2xsaiko *** syncing 2xsaiko -Cloning into '/var/lib/repo-mirror-ci/sync/2xsaiko'... +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 2xsaiko * Sync succeeded $ git log --format=%ci -1 |