diff options
Diffstat (limited to 'andjscott.html')
| -rw-r--r-- | andjscott.html | 44 |
1 files changed, 35 insertions, 9 deletions
diff --git a/andjscott.html b/andjscott.html index 4e6e8b2f3de9..b75d70cea83b 100644 --- a/andjscott.html +++ b/andjscott.html @@ -28,23 +28,49 @@ </pre></td></tr> <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync andjscott </pre></td></tr> - <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>Already up to date. + <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 </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing andjscott + <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 </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** synced andjscott + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 andjscott + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="err" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * x11-misc/autorandr-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> +</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 +</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 andjscott +</pre></td></tr> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** synced andjscott +</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 andjscott +</pre></td></tr> + <tr class="err" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * x11-misc/autorandr-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Cache regen failed with 1 + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Cache regen failed with 1 </pre></td></tr> </table> |