diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-28 08:35:08 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-28 08:35:08 +0000 |
| commit | 801c68a90cd2915b4dfe0738a3dfd731a7af6c80 (patch) | |
| tree | 36067184117289207367a6fe358ea0d106e850f8 /zerodaysfordays.txt | |
| parent | 2020-10-28T08:00:01Z (diff) | |
| download | repos-801c68a90cd2915b4dfe0738a3dfd731a7af6c80.tar.gz repos-801c68a90cd2915b4dfe0738a3dfd731a7af6c80.tar.bz2 repos-801c68a90cd2915b4dfe0738a3dfd731a7af6c80.zip | |
2020-10-28T08:30:01Z
Diffstat (limited to 'zerodaysfordays.txt')
| -rw-r--r-- | zerodaysfordays.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/zerodaysfordays.txt b/zerodaysfordays.txt index 7ae9b69c3938..09d3086a8c02 100644 --- a/zerodaysfordays.txt +++ b/zerodaysfordays.txt @@ -7,9 +7,21 @@ 'quality': 'experimental', 'source': [{'type': 'git', 'uri': 'https://git.sr.ht/~jakob/zerodaysfordays'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync zerodaysfordays -Cloning into '/var/lib/repo-mirror-ci/sync/zerodaysfordays'... +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 zerodaysfordays *** synced zerodaysfordays * Sync succeeded |