diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-09-27 13:35:08 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-09-27 13:35:08 +0000 |
| commit | 41912c12a6337325f290f6e326345febb09beea2 (patch) | |
| tree | 9921e990babdbfae1c816f67b592b82fa9d1e2b1 /pg_overlay.html | |
| parent | 2020-09-27T13:00:01Z (diff) | |
| download | repos-41912c12a6337325f290f6e326345febb09beea2.tar.gz repos-41912c12a6337325f290f6e326345febb09beea2.tar.bz2 repos-41912c12a6337325f290f6e326345febb09beea2.zip | |
2020-09-27T13:30:01Z
Diffstat (limited to 'pg_overlay.html')
| -rw-r--r-- | pg_overlay.html | 64 |
1 files changed, 28 insertions, 36 deletions
diff --git a/pg_overlay.html b/pg_overlay.html index bfacc4b6fd5e..16f7c6729a63 100644 --- a/pg_overlay.html +++ b/pg_overlay.html @@ -34,69 +34,61 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync pg_overlay </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <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 </pre></td></tr> - <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 + <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 </pre></td></tr> - <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 + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> </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 config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only + <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> + <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>You can replace "git config" with "git config --global" to set a default + <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>preference for all repositories. You can also pass --rebase, --no-rebase, + <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>or --ff-only on the command line to override the configured default per + <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>invocation. + <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> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>From https://gitlab.com/Perfect_Gentleman/PG_Overlay </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>From https://gitlab.com/Perfect_Gentleman/PG_Overlay + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> 30664eb..7b5ae38 master -> origin/master </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> 4c88ed3..30664eb master -> origin/master + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Updating 30664eb..7b5ae38 </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Updating 4c88ed3..30664eb + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Fast-forward </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Fast-forward + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> media-libs/mesa/Manifest | 4 ++-- </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> media-libs/mesa/Manifest | 1 + + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> media-libs/mesa/mesa-9999-r1.ebuild | 6 +++--- </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> media-libs/mesa/mesa-9999-r1.ebuild | 566 +++++++++++++++++++++ + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> media-libs/mesa/mesa-9999.ebuild | 2 +- </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> sys-libs/glibc/Manifest | 4 +- + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> 3 files changed, 6 insertions(+), 6 deletions(-) </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> .../{glibc-2.32-r1.ebuild => glibc-2.32-r2.ebuild} | 4 +- + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** syncing pg_overlay </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> 4 files changed, 571 insertions(+), 4 deletions(-) + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced pg_overlay </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> create mode 100644 media-libs/mesa/mesa-9999-r1.ebuild + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> rename sys-libs/glibc/{glibc-2.32-r1.ebuild => glibc-2.32-r2.ebuild} (99%) + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>*** syncing pg_overlay + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** synced pg_overlay + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pg_overlay </pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Sync succeeded -</pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ git log --format=%ci -1 -</pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD -</pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pg_overlay -</pre></td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> |