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 --- x11.html | 40 +++++++--------------------------------- 1 file changed, 7 insertions(+), 33 deletions(-) (limited to 'x11.html') diff --git a/x11.html b/x11.html index 29d5c020a223..469d5368ddee 100644 --- a/x11.html +++ b/x11.html @@ -42,45 +42,19 @@ 16
*** syncing x11
- 17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
Already up to date.
 

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

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

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

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

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

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

-            24
-

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

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

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

-            28
invocation.
-

-            29
-

-            30
Already up to date.
-

-            31
*** synced x11
-

-            32
 * Sync succeeded
-

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

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

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 x11
-

-            36
 * Cache regenerated successfully
+            23
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad