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 --- dm9pZCAq.html | 40 +++++++--------------------------------- 1 file changed, 7 insertions(+), 33 deletions(-) (limited to 'dm9pZCAq.html') diff --git a/dm9pZCAq.html b/dm9pZCAq.html index f10d6f991339..4cad024de0f5 100644 --- a/dm9pZCAq.html +++ b/dm9pZCAq.html @@ -36,45 +36,19 @@ 13
*** syncing dm9pZCAq
- 14
warning: Pulling without specifying how to reconcile divergent branches is
+            14
Already up to date.
 

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

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

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

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

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

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

-            21
-

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

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

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

-            25
invocation.
-

-            26
-

-            27
Already up to date.
-

-            28
*** synced dm9pZCAq
-

-            29
 * Sync succeeded
-

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

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

-            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dm9pZCAq
-

-            33
 * Cache regenerated successfully
+            20
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-18-g5258