From 44bb1b3a1e05d65c59e573816883e43d45595971 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 25 Oct 2020 19:05:08 +0000 Subject: 2020-10-25T19:00:01Z --- interactive-fiction.html | 44 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-) (limited to 'interactive-fiction.html') diff --git a/interactive-fiction.html b/interactive-fiction.html index 40f05bb4ba88..fa9d565f1118 100644 --- a/interactive-fiction.html +++ b/interactive-fiction.html @@ -28,25 +28,49 @@ 9
 'status': 'unofficial'}
- 10
 * Adding new repository
+            10
$ pmaint sync interactive-fiction
 

-            11
$ pmaint sync interactive-fiction
+            11
warning: Pulling without specifying how to reconcile divergent branches is
 

-            12
Cloning into '/var/lib/repo-mirror-ci/sync/interactive-fiction'...
+            12
discouraged. You can squelch this message by running one of the following
 

-            13
*** syncing interactive-fiction
+            13
commands sometime before your next pull:
 

-            14
*** synced interactive-fiction
+            14
 

-            15
 * Sync succeeded
+            15
  git config pull.rebase false  # merge (the default strategy)
 

-            16
$ git log --format=%ci -1
+            16
  git config pull.rebase true   # rebase
 

-            17
$ git show -q --pretty=format:%G? HEAD
+            17
  git config pull.ff only       # fast-forward only
 

-            18
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 interactive-fiction
+            18
 

-            19
 * Cache regenerated successfully
+            19
You can replace "git config" with "git config --global" to set a default
+

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

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

+            22
invocation.
+

+            23
+

+            24
Already up to date.
+

+            25
*** syncing interactive-fiction
+

+            26
*** synced interactive-fiction
+

+            27
 * Sync succeeded
+

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

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

+            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 interactive-fiction
+

+            31
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad