From e8b21aef7a8a8426c4740048544df7ee2091dfa7 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sat, 21 Nov 2020 03:05:15 +0000 Subject: 2020-11-21T03:00:01Z --- posativ.html | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'posativ.html') diff --git a/posativ.html b/posativ.html index 8b04e55f9a3d..1b92e3124b8f 100644 --- a/posativ.html +++ b/posativ.html @@ -36,51 +36,49 @@ 13
$ pmaint sync posativ
 
- 14
WARNING:pkgcore:KBrown-pub repo at '/var/lib/repo-mirror-ci/sync/KBrown-pub', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 
- 15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
discouraged. You can squelch this message by running one of the following
 
- 16
discouraged. You can squelch this message by running one of the following
+            16
commands sometime before your next pull:
 
- 17
commands sometime before your next pull:
+            17
 
- 18
+            18
  git config pull.rebase false  # merge (the default strategy)
 
- 19
  git config pull.rebase false  # merge (the default strategy)
+            19
  git config pull.rebase true   # rebase
 
- 20
  git config pull.rebase true   # rebase
+            20
  git config pull.ff only       # fast-forward only
 
- 21
  git config pull.ff only       # fast-forward only
+            21
 
- 22
+            22
You can replace "git config" with "git config --global" to set a default
 
- 23
You can replace "git config" with "git config --global" to set a default
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 
- 24
preference for all repositories. You can also pass --rebase, --no-rebase,
+            24
or --ff-only on the command line to override the configured default per
 
- 25
or --ff-only on the command line to override the configured default per
+            25
invocation.
 
- 26
invocation.
+            26
 
- 27
+            27
Already up to date.
 
- 28
Already up to date.
+            28
*** syncing posativ
 
- 29
*** syncing posativ
+            29
*** synced posativ
 
- 30
*** synced posativ
+            30
 * Sync succeeded
 
- 31
 * Sync succeeded
+            31
$ git log --format=%ci -1
 
- 32
$ git log --format=%ci -1
+            32
$ git show -q --pretty=format:%G? HEAD
 
- 33
$ git show -q --pretty=format:%G? HEAD
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 posativ
 
- 34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 posativ
-
- 35
 * dev-vcs/git-extras-4.2.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            34
 * dev-vcs/git-extras-4.2.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL] - 36
 * Cache regen failed with 1
+            35
 * Cache regen failed with 1
 
-- cgit v1.2.3-65-gdbad