From c8c0d9168e2b43c0a7362dac128e8af442229c9b Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Tue, 16 Mar 2021 16:50:49 +0000 Subject: 2021-03-16T16:45:01Z --- bloody.html | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'bloody.html') diff --git a/bloody.html b/bloody.html index 15cc45c888b7..433fc8d8b509 100644 --- a/bloody.html +++ b/bloody.html @@ -36,35 +36,35 @@ 13
$ pmaint sync bloody
- 14
*** syncing bloody
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            17
commands sometime before your next pull:
+            17
 

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

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

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

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

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

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

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

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

-            26
invocation.
+            26
 

-            27
+            27
Already up to date.
 

-            28
Already up to date.
+            28
*** syncing bloody
 

             29
*** synced bloody
 

-- 
cgit v1.2.3-65-gdbad