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 --- Case_Of.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'Case_Of.txt') diff --git a/Case_Of.txt b/Case_Of.txt index 9e3bc1746ce8..4c17ba2bad28 100644 --- a/Case_Of.txt +++ b/Case_Of.txt @@ -12,6 +12,19 @@ 'uri': 'git+ssh://git@framagit.org/Case_Of/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync Case_Of +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 Case_Of *** synced Case_Of -- cgit v1.2.3-65-gdbad