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

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

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

-            19
commands sometime before your next pull:
+            19
 

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

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

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

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

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

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

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

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

-            28
invocation.
+            28
 

-            29
+            29
Already up to date.
 

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

             31
*** synced ulm
 

-- 
cgit v1.2.3-65-gdbad