diff options
Diffstat (limited to 'jkolo.txt')
| -rw-r--r-- | jkolo.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/jkolo.txt b/jkolo.txt index c28b7676dee3..4396d9cf8cc2 100644 --- a/jkolo.txt +++ b/jkolo.txt @@ -10,10 +10,22 @@ 'status': 'unofficial'} pkgcore 0.11.2 -- extended version info unavailable - * Adding new repository $ pmaint sync jkolo *** syncing jkolo -Cloning into '/var/lib/repo-mirror-ci/sync/jkolo'... +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 jkolo * Sync succeeded $ git log --format=%ci -1 |