diff options
Diffstat (limited to 'luke-jr.html')
| -rw-r--r-- | luke-jr.html | 60 |
1 files changed, 19 insertions, 41 deletions
diff --git a/luke-jr.html b/luke-jr.html index c1d4751e72a3..90cbb909e115 100644 --- a/luke-jr.html +++ b/luke-jr.html @@ -10,65 +10,43 @@ <table class="log"> - <tr class="" id="l1"><td><a href="#l1"><span>1</span></a></td><td><pre>{'description': {'en': 'Misc ebuilds by Luke-Jr'}, + <tr class="" id="l1"><td><a href="#l1"><span>1</span></a></td><td><pre>{'description': {'en': 'Misc ebuilds by Luke-Jr'}, </pre></td></tr> - <tr class="" id="l2"><td><a href="#l2"><span>2</span></a></td><td><pre> 'homepage': 'http://luke.dashjr.org', + <tr class="" id="l2"><td><a href="#l2"><span>2</span></a></td><td><pre> 'homepage': 'http://luke.dashjr.org', </pre></td></tr> - <tr class="" id="l3"><td><a href="#l3"><span>3</span></a></td><td><pre> 'name': 'luke-jr', + <tr class="" id="l3"><td><a href="#l3"><span>3</span></a></td><td><pre> 'name': 'luke-jr', </pre></td></tr> - <tr class="" id="l4"><td><a href="#l4"><span>4</span></a></td><td><pre> 'owner': [{'email': 'luke-jr+gentoobugs@utopios.org', 'type': 'person'}], + <tr class="" id="l4"><td><a href="#l4"><span>4</span></a></td><td><pre> 'owner': [{'email': 'luke-jr+gentoobugs@utopios.org', 'type': 'person'}], </pre></td></tr> - <tr class="" id="l5"><td><a href="#l5"><span>5</span></a></td><td><pre> 'quality': 'experimental', + <tr class="" id="l5"><td><a href="#l5"><span>5</span></a></td><td><pre> 'quality': 'experimental', </pre></td></tr> - <tr class="" id="l6"><td><a href="#l6"><span>6</span></a></td><td><pre> 'source': [{'type': 'git', + <tr class="" id="l6"><td><a href="#l6"><span>6</span></a></td><td><pre> 'source': [{'type': 'git', </pre></td></tr> - <tr class="" id="l7"><td><a href="#l7"><span>7</span></a></td><td><pre> 'uri': 'https://scm.dashjr.org/scmroot/git/portage-overlays/luke-jr'}], + <tr class="" id="l7"><td><a href="#l7"><span>7</span></a></td><td><pre> 'uri': 'https://scm.dashjr.org/scmroot/git/portage-overlays/luke-jr'}], </pre></td></tr> - <tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre> 'status': 'unofficial'} + <tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre> 'status': 'unofficial'} </pre></td></tr> - <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync luke-jr + <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>pkgcore 0.12.24 </pre></td></tr> - <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync luke-jr </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing luke-jr </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** synced luke-jr </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ git log --format=%ci -1 </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>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 luke-jr </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, -</pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>or --ff-only on the command line to override the configured default per -</pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>invocation. -</pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> -</pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Already up to date. -</pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** syncing luke-jr -</pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** synced luke-jr -</pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Sync succeeded -</pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ git log --format=%ci -1 -</pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD -</pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 luke-jr -</pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> |