From 4ef5b705c32d26cf3d113554782d8699dd0f0c15 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Tue, 4 May 2021 06:34:54 +0000 Subject: 2021-05-04T06:30:01Z --- drdim.html | 40 +++++++--------------------------------- 1 file changed, 7 insertions(+), 33 deletions(-) (limited to 'drdim.html') diff --git a/drdim.html b/drdim.html index 9e8a3f79396a..5c387247cc25 100644 --- a/drdim.html +++ b/drdim.html @@ -44,45 +44,19 @@ 17
*** syncing drdim
- 18
warning: Pulling without specifying how to reconcile divergent branches is
+            18
Already up to date.
 

-            19
discouraged. You can squelch this message by running one of the following
+            19
*** synced drdim
 

-            20
commands sometime before your next pull:
+            20
 * Sync succeeded
 

-            21
+            21
$ git log --format=%ci -1
 

-            22
  git config pull.rebase false  # merge (the default strategy)
+            22
$ git show -q --pretty=format:%G? HEAD
 

-            23
  git config pull.rebase true   # rebase
+            23
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 drdim
 

-            24
  git config pull.ff only       # fast-forward only
-

-            25
-

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

-            27
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            28
or --ff-only on the command line to override the configured default per
-

-            29
invocation.
-

-            30
-

-            31
Already up to date.
-

-            32
*** synced drdim
-

-            33
 * Sync succeeded
-

-            34
$ git log --format=%ci -1
-

-            35
$ git show -q --pretty=format:%G? HEAD
-

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 drdim
-

-            37
 * Cache regenerated successfully
+            24
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-18-g5258