diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-31 13:22:18 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-31 13:22:18 +0000 |
| commit | 04e15158243ade6668007f9c8a07ae434fd707bb (patch) | |
| tree | 999b5e92e6730d8b6fee7b68bd948fed55db1039 /AstroFloyd.txt | |
| parent | 2021-03-31T12:30:01Z (diff) | |
| download | repos-04e15158243ade6668007f9c8a07ae434fd707bb.tar.gz repos-04e15158243ade6668007f9c8a07ae434fd707bb.tar.bz2 repos-04e15158243ade6668007f9c8a07ae434fd707bb.zip | |
2021-03-31T13:15:01Z
Diffstat (limited to 'AstroFloyd.txt')
| -rw-r--r-- | AstroFloyd.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/AstroFloyd.txt b/AstroFloyd.txt index ae8d32bb077e..cd1a5b85f8c4 100644 --- a/AstroFloyd.txt +++ b/AstroFloyd.txt @@ -13,10 +13,22 @@ {'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/user/AstroFloyd.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync AstroFloyd *** syncing AstroFloyd -Cloning into '/var/lib/repo-mirror-ci/sync/AstroFloyd'... +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 AstroFloyd * Sync succeeded $ git log --format=%ci -1 |