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

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

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

-            19
+            19
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            28
+            28
invocation.
 

-            29
Already up to date.
+            29
 

-            30
*** syncing ethereum
+            30
Already up to date.
 

             31
*** synced ethereum
 

-- 
cgit v1.2.3-65-gdbad