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