From e5de98d7bc70d8b1e09fcf616ce129d2e4eddd6b Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 16 Aug 2020 06:35:42 +0000 Subject: 2020-08-16T06:30:01Z --- ahyangyi-overlay.html | 42 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 8 deletions(-) (limited to 'ahyangyi-overlay.html') diff --git a/ahyangyi-overlay.html b/ahyangyi-overlay.html index ec1cfea9afc6..762299423049 100644 --- a/ahyangyi-overlay.html +++ b/ahyangyi-overlay.html @@ -34,21 +34,47 @@ 12
$ pmaint sync ahyangyi-overlay
- 13
Already up to date.
+            13
warning: Pulling without specifying how to reconcile divergent branches is
 

-            14
*** syncing ahyangyi-overlay
+            14
discouraged. You can squelch this message by running one of the following
 

-            15
*** synced ahyangyi-overlay
+            15
commands sometime before your next pull:
 

-            16
 * Sync succeeded
+            16
 

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

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

-            19
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ahyangyi-overlay
+            19
  git config pull.ff only       # fast-forward only
 

-            20
 * Cache regenerated successfully
+            20
+

+            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 ahyangyi-overlay
+

+            28
*** synced ahyangyi-overlay
+

+            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 ahyangyi-overlay
+

+            33
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad