diff options
author | 2020-10-13 14:23:22 +0000 | |
---|---|---|
committer | 2020-10-13 14:23:22 +0000 | |
commit | 55855e87f2620be8198dfd7630e589b5c1d8e676 (patch) | |
tree | e2c3cc646cf1657bc338cc11a2be694a0111db58 /phackerlay.txt | |
parent | 2020-10-13T13:00:01Z (diff) | |
download | repos-55855e87f2620be8198dfd7630e589b5c1d8e676.tar.gz repos-55855e87f2620be8198dfd7630e589b5c1d8e676.tar.bz2 repos-55855e87f2620be8198dfd7630e589b5c1d8e676.zip |
2020-10-13T14:00:01Z
Diffstat (limited to 'phackerlay.txt')
-rw-r--r-- | phackerlay.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/phackerlay.txt b/phackerlay.txt index 88e81f92cb48..5499bb7d3398 100644 --- a/phackerlay.txt +++ b/phackerlay.txt @@ -9,9 +9,21 @@ 'source': [{'type': 'git', 'uri': 'https://gitlab.phys-el.ru/ustinov/phackerlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync phackerlay -Cloning into '/var/lib/repo-mirror-ci/sync/phackerlay'... +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 phackerlay *** synced phackerlay * Sync succeeded |