From e2cf692422c791f0ac5eb5690c2c2d2483899985 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Tue, 22 Sep 2020 06:41:28 +0000 Subject: 2020-09-22T06:30:01Z --- HomeAssistantRepository.html | 44 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-) (limited to 'HomeAssistantRepository.html') diff --git a/HomeAssistantRepository.html b/HomeAssistantRepository.html index 3bf17b272443..9ca02d4ac25a 100644 --- a/HomeAssistantRepository.html +++ b/HomeAssistantRepository.html @@ -36,25 +36,49 @@ 13
 'status': 'unofficial'}
- 14
 * Adding new repository
+            14
$ pmaint sync HomeAssistantRepository
 

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

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

-            17
*** syncing HomeAssistantRepository
+            17
commands sometime before your next pull:
 

-            18
*** synced HomeAssistantRepository
+            18
 

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

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

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

-            22
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 HomeAssistantRepository
+            22
 

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

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

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

+            26
invocation.
+

+            27
+

+            28
Already up to date.
+

+            29
*** syncing HomeAssistantRepository
+

+            30
*** synced HomeAssistantRepository
+

+            31
 * Sync succeeded
+

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

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

+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 HomeAssistantRepository
+

+            35
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad