diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-19 09:35:16 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-19 09:35:16 +0000 |
| commit | 4277dc561ed52a737adf7e19a8cb94334197c983 (patch) | |
| tree | 132b55221c8176cdfd45ab0e4fff478e4c09f3e1 /youbroketheinternet.txt | |
| parent | 2020-11-19T09:00:01Z (diff) | |
| download | repos-4277dc561ed52a737adf7e19a8cb94334197c983.tar.gz repos-4277dc561ed52a737adf7e19a8cb94334197c983.tar.bz2 repos-4277dc561ed52a737adf7e19a8cb94334197c983.zip | |
2020-11-19T09:30:01Z
Diffstat (limited to 'youbroketheinternet.txt')
| -rw-r--r-- | youbroketheinternet.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/youbroketheinternet.txt b/youbroketheinternet.txt index 00fbb5301688..5bbf48619210 100644 --- a/youbroketheinternet.txt +++ b/youbroketheinternet.txt @@ -21,10 +21,22 @@ {'type': 'git', 'uri': 'git://gnunet.org/youbroketheinternet-overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync youbroketheinternet -Cloning into '/var/lib/repo-mirror-ci/sync/youbroketheinternet'... +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. + warning: redirecting to https://git.gnunet.org/youbroketheinternet-overlay.git/ +Already up to date. *** syncing youbroketheinternet *** synced youbroketheinternet * Sync succeeded |