From 35d8c44244b81d318bb52b9a3984864cd593902f Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Tue, 16 Mar 2021 17:50:50 +0000 Subject: 2021-03-16T17:45:01Z --- bumblebee.html | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'bumblebee.html') diff --git a/bumblebee.html b/bumblebee.html index 50689f75b784..9bdd9812c863 100644 --- a/bumblebee.html +++ b/bumblebee.html @@ -34,35 +34,35 @@ 12
$ pmaint sync bumblebee
- 13
warning: Pulling without specifying how to reconcile divergent branches is
+            13
*** syncing bumblebee
 

-            14
discouraged. You can squelch this message by running one of the following
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
commands sometime before your next pull:
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
+            16
commands sometime before your next pull:
 

-            17
  git config pull.rebase false  # merge (the default strategy)
+            17
 

-            18
  git config pull.rebase true   # rebase
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
  git config pull.ff only       # fast-forward only
+            19
  git config pull.rebase true   # rebase
 

-            20
+            20
  git config pull.ff only       # fast-forward only
 

-            21
You can replace "git config" with "git config --global" to set a default
+            21
 

-            22
preference for all repositories. You can also pass --rebase, --no-rebase,
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
or --ff-only on the command line to override the configured default per
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
invocation.
+            24
or --ff-only on the command line to override the configured default per
 

-            25
+            25
invocation.
 

-            26
Already up to date.
+            26
 

-            27
*** syncing bumblebee
+            27
Already up to date.
 

             28
*** synced bumblebee
 

-- 
cgit v1.2.3-65-gdbad