diff options
Diffstat (limited to 'ag-ops.txt')
| -rw-r--r-- | ag-ops.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/ag-ops.txt b/ag-ops.txt index 2fd01c7ac59c..7fe417b6759f 100644 --- a/ag-ops.txt +++ b/ag-ops.txt @@ -10,9 +10,21 @@ {'type': 'git', 'uri': 'git+ssh://git@gitlab.com/ILMostro/ag-ops.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync ag-ops -Cloning into '/var/lib/repo-mirror-ci/sync/ag-ops'... +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 ag-ops *** synced ag-ops * Sync succeeded |