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
52
|
{'description': {'en': "sam_c's personal overlay"},
'feed': ['https://github.com/thesamesam/overlay/commits/master.atom'],
'homepage': 'https://github.com/thesamesam/overlay',
'name': 'sam_c',
'owner': [{'email': 'sam@cmpct.info', 'name': 'Sam James', 'type': 'person'}],
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://github.com/thesamesam/overlay'},
{'type': 'git',
'uri': 'git+ssh://git@github.com/thesamesam/overlay.git'}],
'status': 'unofficial'}
$ pmaint sync sam_c
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/thesamesam/overlay
a797669..349ae3a master -> origin/master
Updating a797669..349ae3a
Fast-forward
net-irc/znc-clientbuffer/Manifest | 1 +
.../znc-clientbuffer}/metadata.xml | 7 +-
.../znc-clientbuffer-1.0.48.ebuild | 38 +++++++++
sys-kernel/gentoo-kernel-bin/Manifest | 3 -
.../gentoo-kernel-bin-5.7.15-r3.ebuild | 50 ------------
sys-kernel/gentoo-kernel-bin/metadata.xml | 7 --
sys-kernel/gentoo-kernel/Manifest | 8 --
.../gentoo-kernel/gentoo-kernel-5.4.56.ebuild | 91 ----------------------
8 files changed, 43 insertions(+), 162 deletions(-)
create mode 100644 net-irc/znc-clientbuffer/Manifest
rename {sys-kernel/gentoo-kernel => net-irc/znc-clientbuffer}/metadata.xml (56%)
create mode 100644 net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
delete mode 100644 sys-kernel/gentoo-kernel-bin/Manifest
delete mode 100644 sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.15-r3.ebuild
delete mode 100644 sys-kernel/gentoo-kernel-bin/metadata.xml
delete mode 100644 sys-kernel/gentoo-kernel/Manifest
delete mode 100644 sys-kernel/gentoo-kernel/gentoo-kernel-5.4.56.ebuild
*** syncing sam_c
*** synced sam_c
* Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sam_c
* Cache regenerated successfully
|
GitWeb
