diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-08-26 05:35:07 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-08-26 05:35:07 +0000 |
| commit | bca7756617544effd1dd2865123d7852c465c1b2 (patch) | |
| tree | 3869184e071d7546e0f263fef716ef5116c33893 /Case_Of.txt | |
| parent | 2020-08-26T05:00:01Z (diff) | |
| download | repos-bca7756617544effd1dd2865123d7852c465c1b2.tar.gz repos-bca7756617544effd1dd2865123d7852c465c1b2.tar.bz2 repos-bca7756617544effd1dd2865123d7852c465c1b2.zip | |
2020-08-26T05:30:02Z
Diffstat (limited to 'Case_Of.txt')
| -rw-r--r-- | Case_Of.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/Case_Of.txt b/Case_Of.txt index fc51e8349676..4c17ba2bad28 100644 --- a/Case_Of.txt +++ b/Case_Of.txt @@ -11,9 +11,21 @@ {'type': 'git', 'uri': 'git+ssh://git@framagit.org/Case_Of/gentoo-overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync Case_Of -Cloning into '/var/lib/repo-mirror-ci/sync/Case_Of'... +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 Case_Of *** synced Case_Of * Sync succeeded |