diff options
Diffstat (limited to 'SwordArMor.txt')
| -rw-r--r-- | SwordArMor.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/SwordArMor.txt b/SwordArMor.txt index b68e604dbd91..c5707e9f49c5 100644 --- a/SwordArMor.txt +++ b/SwordArMor.txt @@ -10,10 +10,22 @@ {'type': 'git', 'uri': 'git+ssh://git@git.grifon.fr:alarig/SwordArMor-gentoo-overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync SwordArMor *** syncing SwordArMor -Cloning into '/var/lib/repo-mirror-ci/sync/SwordArMor'... +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 SwordArMor * Sync succeeded $ git log --format=%ci -1 |