From 3ece0325dd53a4997b6c9886ac65bce93e575c55 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 15 Mar 2021 22:07:49 +0000 Subject: 2021-03-15T22:00:01Z --- foxiverlay.html | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'foxiverlay.html') diff --git a/foxiverlay.html b/foxiverlay.html index 22799b4608c3..988594cf8f1a 100644 --- a/foxiverlay.html +++ b/foxiverlay.html @@ -36,35 +36,35 @@ 13
$ pmaint sync foxiverlay
- 14
warning: Pulling without specifying how to reconcile divergent branches is
+            14
*** syncing foxiverlay
 

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

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

-            17
+            17
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            26
+            26
invocation.
 

-            27
Already up to date.
+            27
 

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

             29
*** synced foxiverlay
 

-- 
cgit v1.2.3-65-gdbad