diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-13 18:05:18 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-13 18:05:18 +0000 |
commit | e1d76d5e6107970234d54cd9822ed4e5c6b5710b (patch) | |
tree | 350ca5fbb86b7a1cd7a09e8fe60178fe52ff4029 /wayland-desktop.html | |
parent | 2020-11-13T17:30:01Z (diff) | |
download | repos-e1d76d5e6107970234d54cd9822ed4e5c6b5710b.tar.gz repos-e1d76d5e6107970234d54cd9822ed4e5c6b5710b.tar.bz2 repos-e1d76d5e6107970234d54cd9822ed4e5c6b5710b.zip |
2020-11-13T18:00:01Z
Diffstat (limited to 'wayland-desktop.html')
-rw-r--r-- | wayland-desktop.html | 60 |
1 files changed, 13 insertions, 47 deletions
diff --git a/wayland-desktop.html b/wayland-desktop.html index f295970ebadf..65a5bc014678 100644 --- a/wayland-desktop.html +++ b/wayland-desktop.html @@ -12,7 +12,7 @@ <tr class="" id="l1"><td><a href="#l1"><span>1</span></a></td><td><pre>{'description': {'en': 'gentoo overlay for wayland related ebuilds'}, </pre></td></tr> - <tr class="" id="l2"><td><a href="#l2"><span>2</span></a></td><td><pre> 'homepage': 'https://github.com/epsilon-0/wayland-desktop', + <tr class="" id="l2"><td><a href="#l2"><span>2</span></a></td><td><pre> 'homepage': 'https://github.com/bsd-ac/wayland-desktop', </pre></td></tr> <tr class="" id="l3"><td><a href="#l3"><span>3</span></a></td><td><pre> 'name': 'wayland-desktop', </pre></td></tr> @@ -26,67 +26,33 @@ </pre></td></tr> <tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre> 'source': [{'type': 'git', </pre></td></tr> - <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> 'uri': 'https://github.com/epsilon-0/wayland-desktop.git'}, + <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> 'uri': 'https://github.com/bsd-ac/wayland-desktop.git'}, </pre></td></tr> <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> {'type': 'git', </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> 'uri': 'git+ssh://git@github.com/epsilon-0/wayland-desktop.git'}], + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> 'uri': 'git+ssh://git@github.com/bsd-ac/wayland-desktop.git'}], </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> 'status': 'unofficial'} </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync wayland-desktop + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Resetting, sync parameters changed </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync wayland-desktop </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>Cloning into '/var/lib/repo-mirror-ci/sync/wayland-desktop'... </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing wayland-desktop </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced wayland-desktop </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 wayland-desktop </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default -</pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, -</pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per -</pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation. -</pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> -</pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>From https://github.com/epsilon-0/wayland-desktop -</pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> 61e1657..fa07330 master -> origin/master -</pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Updating 61e1657..fa07330 -</pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Fast-forward -</pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> README.md | 21 ++++++++++++++++++++- -</pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> 1 file changed, 20 insertions(+), 1 deletion(-) -</pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** syncing wayland-desktop -</pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced wayland-desktop -</pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded -</pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1 -</pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD -</pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 wayland-desktop -</pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> |