diff options
Diffstat (limited to 'calculate.txt')
| -rw-r--r-- | calculate.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/calculate.txt b/calculate.txt index 3d454096316e..135ba4298410 100644 --- a/calculate.txt +++ b/calculate.txt @@ -6,9 +6,21 @@ 'source': [{'type': 'git', 'uri': 'git://git.calculate-linux.org/calculate/calculate-overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync calculate -Cloning into '/var/lib/repo-mirror-ci/sync/calculate'... +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 calculate *** synced calculate * Sync succeeded |