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 --- megacoffee.html | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'megacoffee.html') diff --git a/megacoffee.html b/megacoffee.html index 8eb482cae987..c0509ce3dbf7 100644 --- a/megacoffee.html +++ b/megacoffee.html @@ -56,35 +56,35 @@ 23
$ pmaint sync megacoffee
- 24
*** syncing megacoffee
+            24
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            27
commands sometime before your next pull:
+            27
 

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

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

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

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

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

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

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

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

-            36
invocation.
+            36
 

-            37
+            37
Already up to date.
 

-            38
Already up to date.
+            38
*** syncing megacoffee
 

             39
*** synced megacoffee
 

-- 
cgit v1.2.3-65-gdbad