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

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

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

-            15
commands sometime before your next pull:
+            15
 

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

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

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

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

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

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

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

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

-            24
invocation.
+            24
 

-            25
+            25
Already up to date.
 

-            26
Already up to date.
+            26
*** syncing tastytea
 

             27
*** synced tastytea
 

-- 
cgit v1.2.3-65-gdbad