From c029bea15f9574cb289b51924918037952d44062 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 6 Sep 2020 19:35:13 +0000 Subject: 2020-09-06T19:30:01Z --- phackerlay.html | 44 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-) (limited to 'phackerlay.html') diff --git a/phackerlay.html b/phackerlay.html index f9f87b40a369..7203ed2f83a8 100644 --- a/phackerlay.html +++ b/phackerlay.html @@ -32,25 +32,49 @@ 11
 'status': 'unofficial'}
- 12
 * Adding new repository
+            12
$ pmaint sync phackerlay
 

-            13
$ pmaint sync phackerlay
+            13
warning: Pulling without specifying how to reconcile divergent branches is
 

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

-            15
*** syncing phackerlay
+            15
commands sometime before your next pull:
 

-            16
*** synced phackerlay
+            16
 

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

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

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

-            20
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 phackerlay
+            20
 

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

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

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

+            24
invocation.
+

+            25
+

+            26
Already up to date.
+

+            27
*** syncing phackerlay
+

+            28
*** synced phackerlay
+

+            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 1 phackerlay
+

+            33
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad