summaryrefslogtreecommitdiff
blob: 412c9e5fa2d515c5af69a3bf10ff615d1973c57e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
{'description': {'en': "crocket's personal overlay"},
 'feed': ['https://github.com/crocket/crocket-overlay/commits/master.atom'],
 'homepage': 'https://github.com/crocket/crocket-overlay',
 'name': 'crocket-overlay',
 'owner': [{'email': 'crockabiscuit@gmail.com',
            'name': 'crocket',
            'type': 'person'}],
 'quality': 'experimental',
 'source': [{'type': 'git',
             'uri': 'https://github.com/crocket/crocket-overlay.git'},
            {'type': 'git',
             'uri': 'git+ssh://git@github.com/crocket/crocket-overlay.git'}],
 'status': 'unofficial'}
pkgcore 0.11.2 -- extended version info unavailable

$ pmaint sync crocket-overlay
*** syncing crocket-overlay
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
commands sometime before your next pull:

  git config pull.rebase false  # merge (the default strategy)
  git config pull.rebase true   # rebase
  git config pull.ff only       # fast-forward only

You can replace "git config" with "git config --global" to set a default
preference for all repositories. You can also pass --rebase, --no-rebase,
or --ff-only on the command line to override the configured default per
invocation.

From https://github.com/crocket/crocket-overlay
   12b35a2..650c726  master     -> origin/master
Updating 12b35a2..650c726
Fast-forward
 media-fonts/ipaex/Manifest                            |  1 -
 media-fonts/ipaex/files/45-ipaex.conf                 | 13 -------------
 media-fonts/ipaex/ipaex-004.01.ebuild                 | 19 -------------------
 media-fonts/ipaex/metadata.xml                        |  4 ----
 ...25-r1.ebuild => pam-gnupg-0.2_p20201125-r2.ebuild} |  2 +-
 5 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 media-fonts/ipaex/Manifest
 delete mode 100644 media-fonts/ipaex/files/45-ipaex.conf
 delete mode 100644 media-fonts/ipaex/ipaex-004.01.ebuild
 delete mode 100644 media-fonts/ipaex/metadata.xml
 rename sys-auth/pam-gnupg/{pam-gnupg-0.2_p20201125-r1.ebuild => pam-gnupg-0.2_p20201125-r2.ebuild} (95%)
*** synced crocket-overlay
 * Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 crocket-overlay
 * Cache regenerated successfully