diff options
Diffstat (limited to 'gentoo-zh.html')
| -rw-r--r-- | gentoo-zh.html | 68 |
1 files changed, 46 insertions, 22 deletions
diff --git a/gentoo-zh.html b/gentoo-zh.html index 3c8ccd158fc9..d5403e29de50 100644 --- a/gentoo-zh.html +++ b/gentoo-zh.html @@ -30,49 +30,73 @@ </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 gentoo-zh + <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>pkgcore 0.11.2 -- extended version info unavailable </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing gentoo-zh + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> </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>$ pmaint sync gentoo-zh </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>*** syncing gentoo-zh </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>warning: Pulling without specifying how to reconcile divergent branches is </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>discouraged. You can squelch this message by running one of the following </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>commands sometime before your next pull: </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> </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> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase </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 + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only </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, + <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>or --ff-only on the command line to override the configured default per + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date. + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced gentoo-zh + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>From git://github.com/microcai/gentoo-zh </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> 07a6f201..c4c287c2 master -> origin/master </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Updating 07a6f201..c4c287c2 </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo-zh + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Fast-forward </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> app-i18n/fcitx5-gtk/{fcitx5-gtk-5.0.5.ebuild => fcitx5-gtk-5.0.6.ebuild} | 0 +</pre></td></tr> + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> app-i18n/fcitx5-qt/{fcitx5-qt-5.0.4.ebuild => fcitx5-qt-5.0.5.ebuild} | 0 +</pre></td></tr> + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> app-i18n/fcitx5/{fcitx5-5.0.6.ebuild => fcitx5-5.0.7.ebuild} | 0 +</pre></td></tr> + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> 3 files changed, 0 insertions(+), 0 deletions(-) +</pre></td></tr> + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> rename app-i18n/fcitx5-gtk/{fcitx5-gtk-5.0.5.ebuild => fcitx5-gtk-5.0.6.ebuild} (100%) +</pre></td></tr> + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> rename app-i18n/fcitx5-qt/{fcitx5-qt-5.0.4.ebuild => fcitx5-qt-5.0.5.ebuild} (100%) +</pre></td></tr> + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> rename app-i18n/fcitx5/{fcitx5-5.0.6.ebuild => fcitx5-5.0.7.ebuild} (100%) +</pre></td></tr> + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** synced gentoo-zh +</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 32 gentoo-zh +</pre></td></tr> + <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> |