diff options
Diffstat (limited to 'pentoo.html')
| -rw-r--r-- | pentoo.html | 106 |
1 files changed, 28 insertions, 78 deletions
diff --git a/pentoo.html b/pentoo.html index f6211d25e0ee..6267ac1fc7f6 100644 --- a/pentoo.html +++ b/pentoo.html @@ -34,111 +34,61 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync pentoo </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:KBrown-pub repo at '/var/lib/repo-mirror-ci/sync/KBrown-pub', 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://github.com/pentoo/pentoo-overlay </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>From https://github.com/pentoo/pentoo-overlay + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> 6e84f5234..0e7affb26 master -> origin/master </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> b0a711aa9..6e84f5234 master -> origin/master + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Updating 6e84f5234..0e7affb26 </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Updating b0a711aa9..6e84f5234 + <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> sys-apps/openrazer/Manifest | 1 + </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> dev-python/aiocmd/aiocmd-0.1.5.ebuild | 5 ++-- + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> sys-apps/openrazer/openrazer-2.9.0.ebuild | 85 +++++++++++++++++++++++++++++++ </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> dev-python/asciitree/asciitree-0.3.3.ebuild | 5 ++-- + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> 2 files changed, 86 insertions(+) </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> dev-python/msldap/Manifest | 1 + + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> create mode 100644 sys-apps/openrazer/openrazer-2.9.0.ebuild </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> dev-python/msldap/msldap-0.3.20.ebuild | 32 ++++++++++++++++++++ + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** syncing pentoo </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> dev-python/pylnk3/Manifest | 2 +- + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced pentoo </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> dev-python/pylnk3/pylnk3-0.3.0.ebuild | 29 ------------------ + <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> dev-python/pylnk3/pylnk3-0.4.2.ebuild | 20 +++++++++++++ + <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> dev-python/winacl/winacl-0.1.0.ebuild | 2 +- + <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> dev-python/winsspi/winsspi-0.0.9.ebuild | 2 +- + <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 pentoo </pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> dev-qt/qtserialport/Manifest | 1 + -</pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> dev-qt/qtserialport/qtserialport-5.15.2.ebuild | 34 ++++++++++++++++++++++ -</pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> dev-ruby/bootstrap/Manifest | 1 + -</pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> dev-ruby/bootstrap/bootstrap-4.5.3.ebuild | 31 ++++++++++++++++++++ -</pre></td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> dev-ruby/dry-core/Manifest | 1 + -</pre></td></tr> - <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> dev-ruby/dry-core/dry-core-0.4.10.ebuild | 19 ++++++++++++ -</pre></td></tr> - <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> .../grape-active_model_serializers-1.5.2.ebuild | 2 +- -</pre></td></tr> - <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> dev-ruby/grape/Manifest | 1 + -</pre></td></tr> - <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> dev-ruby/grape/grape-1.5.1.ebuild | 24 +++++++++++++++ -</pre></td></tr> - <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> dev-ruby/popper_js/popper_js-1.16.0.ebuild | 4 +-- -</pre></td></tr> - <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> .../pentoo/base/package.accept_keywords/dev-ruby | 1 - -</pre></td></tr> - <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> 20 files changed, 175 insertions(+), 42 deletions(-) -</pre></td></tr> - <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> create mode 100644 dev-python/msldap/msldap-0.3.20.ebuild -</pre></td></tr> - <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> delete mode 100644 dev-python/pylnk3/pylnk3-0.3.0.ebuild -</pre></td></tr> - <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> create mode 100644 dev-python/pylnk3/pylnk3-0.4.2.ebuild -</pre></td></tr> - <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> create mode 100644 dev-qt/qtserialport/qtserialport-5.15.2.ebuild -</pre></td></tr> - <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> create mode 100644 dev-ruby/bootstrap/bootstrap-4.5.3.ebuild -</pre></td></tr> - <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> create mode 100644 dev-ruby/dry-core/dry-core-0.4.10.ebuild -</pre></td></tr> - <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> create mode 100644 dev-ruby/grape/grape-1.5.1.ebuild -</pre></td></tr> - <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>*** syncing pentoo -</pre></td></tr> - <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>*** synced pentoo -</pre></td></tr> - <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Sync succeeded -</pre></td></tr> - <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ git log --format=%ci -1 -</pre></td></tr> - <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD -</pre></td></tr> - <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pentoo -</pre></td></tr> - <tr class="" id="l65"><td><a href="#l65"><span>65</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> |