From e5de98d7bc70d8b1e09fcf616ce129d2e4eddd6b Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 16 Aug 2020 06:35:42 +0000 Subject: 2020-08-16T06:30:01Z --- activehome.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'activehome.txt') diff --git a/activehome.txt b/activehome.txt index babf1a21334e..2c6036c68eb9 100644 --- a/activehome.txt +++ b/activehome.txt @@ -17,6 +17,19 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/activehome.git'}], 'status': 'unofficial'} $ pmaint sync activehome +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 activehome *** synced activehome -- cgit v1.2.3-65-gdbad