diff options
Diffstat (limited to 'chrisadr.html')
| -rw-r--r-- | chrisadr.html | 72 |
1 files changed, 1 insertions, 71 deletions
diff --git a/chrisadr.html b/chrisadr.html index 123bb28a3154..0dd187ec2e0c 100644 --- a/chrisadr.html +++ b/chrisadr.html @@ -10,77 +10,7 @@ <table class="log"> - <tr class="" id="l1"><td><a href="#l1"><span>1</span></a></td><td><pre>{'description': {'en': "ChrisADR's personal overlay"}, -</pre></td></tr> - <tr class="" id="l2"><td><a href="#l2"><span>2</span></a></td><td><pre> 'feed': ['https://github.com/ChrisADR/chrisadr-overlay/commits/master.atom'], -</pre></td></tr> - <tr class="" id="l3"><td><a href="#l3"><span>3</span></a></td><td><pre> 'homepage': 'https://github.com/ChrisADR/chrisadr-overlay', -</pre></td></tr> - <tr class="" id="l4"><td><a href="#l4"><span>4</span></a></td><td><pre> 'name': 'chrisadr', -</pre></td></tr> - <tr class="" id="l5"><td><a href="#l5"><span>5</span></a></td><td><pre> 'owner': [{'email': 'chrisadr@gentoo.org', -</pre></td></tr> - <tr class="" id="l6"><td><a href="#l6"><span>6</span></a></td><td><pre> 'name': 'Christopher Díaz Riveros', -</pre></td></tr> - <tr class="" id="l7"><td><a href="#l7"><span>7</span></a></td><td><pre> 'type': 'person'}], -</pre></td></tr> - <tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre> 'quality': 'experimental', -</pre></td></tr> - <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> 'source': [{'type': 'git', -</pre></td></tr> - <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> 'uri': 'https://github.com/ChrisADR/chrisadr-overlay.git'}, -</pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> {'type': 'git', -</pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> 'uri': 'git@github.com:ChrisADR/chrisadr-overlay.git'}], -</pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> 'status': 'unofficial'} -</pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync chrisadr -</pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing chrisadr -</pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is -</pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following -</pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: -</pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> -</pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) -</pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase -</pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only -</pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> -</pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default -</pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, -</pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per -</pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. -</pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> -</pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. -</pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced chrisadr -</pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded -</pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1 -</pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD -</pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 chrisadr -</pre></td></tr> - <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * app-admin/installer-0.1.1_beta: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die) -</pre></td><td>[FATAL]</td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regen failed with 1 + <tr class="" id="l1"><td><a href="#l1"><span>1</span></a></td><td><pre> * Removing, no longer on remote list </pre></td></tr> </table> |