diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-21 03:35:11 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-21 03:35:11 +0000 |
| commit | 57ec04c848004df1798c247f2e9f117af99ef348 (patch) | |
| tree | ab5475db2abe5265e6a1866f4140575e123321b0 /KBrown-pub.txt | |
| parent | 2020-11-21T03:00:01Z (diff) | |
| download | repos-57ec04c848004df1798c247f2e9f117af99ef348.tar.gz repos-57ec04c848004df1798c247f2e9f117af99ef348.tar.bz2 repos-57ec04c848004df1798c247f2e9f117af99ef348.zip | |
2020-11-21T03:30:01Z
Diffstat (limited to 'KBrown-pub.txt')
| -rw-r--r-- | KBrown-pub.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/KBrown-pub.txt b/KBrown-pub.txt index 6f8531227805..768fe7425388 100644 --- a/KBrown-pub.txt +++ b/KBrown-pub.txt @@ -11,9 +11,21 @@ {'type': 'git', 'uri': 'https://github.com/KenjiBrown/gentoo-overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync KBrown-pub -Cloning into '/var/lib/repo-mirror-ci/sync/KBrown-pub'... +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 KBrown-pub *** synced KBrown-pub * Sync succeeded |