diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-04-28 20:49:55 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-04-28 20:49:55 +0000 |
| commit | 41891430416ed0e0df3c6e87db9ea292eed4ba51 (patch) | |
| tree | 89e278c3152c1185f4f83185b2e81dc8591c0f47 /gitlab.html | |
| parent | 2021-04-28T20:30:01Z (diff) | |
| download | repos-41891430416ed0e0df3c6e87db9ea292eed4ba51.tar.gz repos-41891430416ed0e0df3c6e87db9ea292eed4ba51.tar.bz2 repos-41891430416ed0e0df3c6e87db9ea292eed4ba51.zip | |
2021-04-28T20:45:01Z
Diffstat (limited to 'gitlab.html')
| -rw-r--r-- | gitlab.html | 50 |
1 files changed, 10 insertions, 40 deletions
diff --git a/gitlab.html b/gitlab.html index bca0b9c0e271..35f556a5ca0d 100644 --- a/gitlab.html +++ b/gitlab.html @@ -30,55 +30,25 @@ </pre></td></tr> <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> 'status': 'unofficial'} </pre></td></tr> - <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync gitlab + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing gitlab + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync gitlab </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing gitlab </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>Cloning into '/var/lib/repo-mirror-ci/sync/gitlab'... </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** synced gitlab </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gitlab </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> -</pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default -</pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, -</pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per -</pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. -</pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> -</pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>fatal: unable to access 'https://gitlab.awesome-it.de/overlays/gitlab.git/': Couldn't resolve host 'gitlab.awesome-it.de' -</pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>!!! failed syncing gitlab -</pre></td></tr> - <tr class="err" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync failed with 1 -</pre></td><td>[FATAL]</td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Will try to re-create -</pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ pmaint sync gitlab -</pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing gitlab -</pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Cloning into '/var/lib/repo-mirror-ci/sync/gitlab'... -</pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>fatal: unable to access 'https://gitlab.awesome-it.de/overlays/gitlab.git/': Couldn't resolve host 'gitlab.awesome-it.de' -</pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>!!! failed syncing gitlab -</pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync failed again with 1, removing + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> |