diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-04-12 15:49:59 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-04-12 15:49:59 +0000 |
| commit | e5b1a9bc81e14c1b933c757782d4f9855572f1ac (patch) | |
| tree | 38b7e7a003b1d48b53d0ff4fea9f6813a2db28f4 /bitcetera.txt | |
| parent | 2021-04-12T15:30:01Z (diff) | |
| download | repos-e5b1a9bc81e14c1b933c757782d4f9855572f1ac.tar.gz repos-e5b1a9bc81e14c1b933c757782d4f9855572f1ac.tar.bz2 repos-e5b1a9bc81e14c1b933c757782d4f9855572f1ac.zip | |
2021-04-12T15:45:01Z
Diffstat (limited to 'bitcetera.txt')
| -rw-r--r-- | bitcetera.txt | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/bitcetera.txt b/bitcetera.txt index 746fd25f5aac..0296dd83fca6 100644 --- a/bitcetera.txt +++ b/bitcetera.txt @@ -15,7 +15,20 @@ 'status': 'unofficial'} $ pmaint sync bitcetera *** syncing bitcetera -Cloning into '/var/lib/repo-mirror-ci/sync/bitcetera'... +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 bitcetera * Sync succeeded $ git log --format=%ci -1 |