summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-05-02 00:34:52 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-05-02 00:34:52 +0000
commitde72c70fb2bc516d3dc0a8e7f714471e514cd0e9 (patch)
treeb1956396fe7aba7fc21b017743942e53d470a08e /dm9pZCAq.html
parent2021-05-02T00:15:01Z (diff)
downloadrepos-de72c70fb2bc516d3dc0a8e7f714471e514cd0e9.tar.gz
repos-de72c70fb2bc516d3dc0a8e7f714471e514cd0e9.tar.bz2
repos-de72c70fb2bc516d3dc0a8e7f714471e514cd0e9.zip
2021-05-02T00:30:01Z
Diffstat (limited to 'dm9pZCAq.html')
-rw-r--r--dm9pZCAq.html48
1 files changed, 36 insertions, 12 deletions
diff --git a/dm9pZCAq.html b/dm9pZCAq.html
index b631aa264d4..68c0efee470 100644
--- a/dm9pZCAq.html
+++ b/dm9pZCAq.html
@@ -32,29 +32,53 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync dm9pZCAq
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync dm9pZCAq
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing dm9pZCAq
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing dm9pZCAq
+ <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
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;...
+ <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
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** synced dm9pZCAq
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Sync succeeded
+ <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>$ git log --format=%ci -1
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dm9pZCAq
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="err" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * app-crypt/veracrypt-1.24_p7: failed sourcing ebuild: Unsupported EAPI=6 (too old) for wxwidgets, (wxwidgets.eclass, line 25: called die)
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; 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>Already up to date.
+</pre></td></tr>
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced dm9pZCAq
+</pre></td></tr>
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dm9pZCAq
+</pre></td></tr>
+ <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * app-crypt/veracrypt-1.24_p7: failed sourcing ebuild: Unsupported EAPI=6 (too old) for wxwidgets, (wxwidgets.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * app-crypt/veracrypt-1.24_p8: failed sourcing ebuild: Unsupported EAPI=6 (too old) for wxwidgets, (wxwidgets.eclass, line 25: called die)
+ <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * app-crypt/veracrypt-1.24_p8: failed sourcing ebuild: Unsupported EAPI=6 (too old) for wxwidgets, (wxwidgets.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>