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 --- stuff.html | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'stuff.html') diff --git a/stuff.html b/stuff.html index 32ba19ae3616..9fb8e32f50e6 100644 --- a/stuff.html +++ b/stuff.html @@ -28,35 +28,35 @@ 9
$ pmaint sync stuff
- 10
warning: Pulling without specifying how to reconcile divergent branches is
+            10
*** syncing stuff
 

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

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

-            13
+            13
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            22
+            22
invocation.
 

-            23
Already up to date.
+            23
 

-            24
*** syncing stuff
+            24
Already up to date.
 

             25
*** synced stuff
 

-- 
cgit v1.2.3-65-gdbad