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
|
{'description': {'en': 'Personal portage overlay'},
'feed': ['https://slonko.net/git/portage/atom/'],
'homepage': 'https://slonko.net/portage',
'name': 'slonko',
'owner': [{'email': 'marcin.deranek@slonko.net',
'name': 'Marcin Deranek',
'type': 'person'}],
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://slonko.net/git/portage'}],
'status': 'unofficial'}
$ pmaint sync slonko
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://slonko.net/git/portage
3e57278..8bfd6a3 master -> origin/master
Updating 3e57278..8bfd6a3
Fast-forward
x11-wm/compiz/Manifest | 3 +--
x11-wm/compiz/compiz-9999.ebuild | 1 -
x11-wm/compiz/files/gcc-10.patch | 24 ------------------------
3 files changed, 1 insertion(+), 27 deletions(-)
delete mode 100644 x11-wm/compiz/files/gcc-10.patch
*** syncing slonko
*** synced slonko
* Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 slonko
* Cache regenerated successfully
|
GitWeb
