diff options
Diffstat (limited to 'holgersson-overlay.txt')
| -rw-r--r-- | holgersson-overlay.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/holgersson-overlay.txt b/holgersson-overlay.txt index 073e4772445a..7156843b1e10 100644 --- a/holgersson-overlay.txt +++ b/holgersson-overlay.txt @@ -8,9 +8,21 @@ 'source': [{'type': 'git', 'uri': 'https://git.holgersson.xyz/foss/holgersson-overlay'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync holgersson-overlay -Cloning into '/var/lib/repo-mirror-ci/sync/holgersson-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 holgersson-overlay *** synced holgersson-overlay * Sync succeeded |