summaryrefslogtreecommitdiff
blob: 479428ae3c0ff0b7d70af80d39ac5a3975f690c6 (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
{'description': {'en': 'Calculate Overlay'},
 'homepage': 'http://www.calculate-linux.org',
 'name': 'calculate',
 'owner': [{'email': 'at@calculate.ru', 'type': 'person'}],
 'quality': 'experimental',
 'source': [{'type': 'git',
             'uri': 'git://git.calculate-linux.org/calculate/calculate-overlay.git'}],
 'status': 'unofficial'}
$ pmaint sync calculate
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 git://git.calculate-linux.org/calculate/calculate-overlay
   a40701a18..6d1195435  master     -> origin/master
   a40701a18..6d1195435  master64   -> origin/master64
 * [new tag]             2268       -> 2268
Updating a40701a18..6d1195435
Fast-forward
 .../3.6/2_ac_install_merge/media-gfx/fontforge/fontforge.desktop        | 2 +-
 .../media-gfx/fontforge/org.fontforge.FontForge.desktop                 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/fontforge/org.fontforge.FontForge.desktop
*** syncing calculate
*** synced calculate
 * Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 calculate
 * Cache regenerated successfully