From eab2968279da030d07e7f02d0aafc7f02335cf0e Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 2 May 2021 09:04:58 +0000 Subject: 2021-05-02T09:00:01Z --- HomeAssistantRepository.html | 44 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-) (limited to 'HomeAssistantRepository.html') diff --git a/HomeAssistantRepository.html b/HomeAssistantRepository.html index 90c1d65e1bde..faa1248e57b5 100644 --- a/HomeAssistantRepository.html +++ b/HomeAssistantRepository.html @@ -40,25 +40,49 @@ 15
- 16
 * Adding new repository
+            16
$ pmaint sync HomeAssistantRepository
 

-            17
$ pmaint sync HomeAssistantRepository
+            17
*** syncing HomeAssistantRepository
 

-            18
*** syncing HomeAssistantRepository
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

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

-            20
*** synced HomeAssistantRepository
+            20
commands sometime before your next pull:
 

-            21
 * Sync succeeded
+            21
 

-            22
$ git log --format=%ci -1
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
$ git show -q --pretty=format:%G? HEAD
+            23
  git config pull.rebase true   # rebase
 

-            24
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 HomeAssistantRepository
+            24
  git config pull.ff only       # fast-forward only
 

-            25
 * Cache regenerated successfully
+            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 HomeAssistantRepository
+

+            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 HomeAssistantRepository
+

+            37
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad