From 4ef5b705c32d26cf3d113554782d8699dd0f0c15 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Tue, 4 May 2021 06:34:54 +0000 Subject: 2021-05-04T06:30:01Z --- squeezebox.txt | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'squeezebox.txt') diff --git a/squeezebox.txt b/squeezebox.txt index 68e932f18c43..c9ee87d5b2a4 100644 --- a/squeezebox.txt +++ b/squeezebox.txt @@ -18,19 +18,6 @@ pkgcore 0.11.2 -- extended version info unavailable $ pmaint sync squeezebox *** syncing squeezebox -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 squeezebox * Sync succeeded -- cgit v1.2.3-65-gdbad