2020-10-29T02:00:01Z

1 files changed, 33 insertions, 165 deletions

diff --git a/gentoo.html b/gentoo.html
index 4b42bdc14b5e..489c0ff5375c 100644
--- a/gentoo.html
+++ b/gentoo.html
@@ -36,203 +36,71 @@
 </pre></td></tr>
             <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> 'status': 'official'}
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync gentoo
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync gentoo
+            <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>Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'...
+            <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>Updating files:  17% (14877/87300)
+            <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>Updating files:  18% (15714/87300)
+            <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>Updating files:  19% (16587/87300)
+            <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>Updating files:  20% (17460/87300)
+            <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>Updating files:  21% (18333/87300)
+            <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>Updating files:  22% (19206/87300)
+            <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>Updating files:  23% (20079/87300)
+            <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>Updating files:  24% (20952/87300)
+            <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>Updating files:  25% (21825/87300)
+            <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>Updating files:  26% (22698/87300)
+            <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>Updating files:  27% (23571/87300)
+            <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>Updating files:  28% (24444/87300)
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>From https://anongit.gentoo.org/git/repo/gentoo
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Updating files:  29% (25317/87300)
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>   468e97372af..85553f7e2a3  master     -&gt; origin/master
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Updating files:  30% (26190/87300)
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Updating 468e97372af..85553f7e2a3
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Updating files:  31% (27063/87300)
+            <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>Updating files:  32% (27936/87300)
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> dev-java/openjdk-bin/openjdk-bin-8.272_p10.ebuild  |  2 +-
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Updating files:  33% (28809/87300)
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> .../openjdk-jre-bin-8.272_p10.ebuild               |  2 +-
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Updating files:  34% (29682/87300)
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> dev-java/openjdk/openjdk-8.272_p10.ebuild          |  2 +-
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>Updating files:  35% (30555/87300)
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> net-misc/unison/Manifest                           |  1 -
 </pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>Updating files:  35% (30557/87300)
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> net-misc/unison/unison-2.51.3.ebuild               | 97 ----------------------
 </pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>Updating files:  36% (31428/87300)
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> net-wireless/blueman/blueman-2.1.4.ebuild          |  2 +-
 </pre></td></tr>
-            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>Updating files:  37% (32301/87300)
+            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> 6 files changed, 4 insertions(+), 102 deletions(-)
 </pre></td></tr>
-            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>Updating files:  38% (33174/87300)
+            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> delete mode 100644 net-misc/unison/unison-2.51.3.ebuild
 </pre></td></tr>
-            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>Updating files:  39% (34047/87300)
+            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>*** syncing gentoo
 </pre></td></tr>
-            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Updating files:  40% (34920/87300)
+            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>*** synced gentoo
 </pre></td></tr>
-            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Updating files:  41% (35793/87300)
+            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Updating files:  42% (36666/87300)
+            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Updating files:  43% (37539/87300)
+            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Updating files:  44% (38412/87300)
+            <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo
 </pre></td></tr>
-            <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Updating files:  45% (39285/87300)
-</pre></td></tr>
-            <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Updating files:  46% (40158/87300)
-</pre></td></tr>
-            <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Updating files:  47% (41031/87300)
-</pre></td></tr>
-            <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Updating files:  48% (41904/87300)
-</pre></td></tr>
-            <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Updating files:  49% (42777/87300)
-</pre></td></tr>
-            <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Updating files:  50% (43650/87300)
-</pre></td></tr>
-            <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Updating files:  51% (44523/87300)
-</pre></td></tr>
-            <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Updating files:  51% (45387/87300)
-</pre></td></tr>
-            <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Updating files:  52% (45396/87300)
-</pre></td></tr>
-            <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>Updating files:  53% (46269/87300)
-</pre></td></tr>
-            <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>Updating files:  54% (47142/87300)
-</pre></td></tr>
-            <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>Updating files:  55% (48015/87300)
-</pre></td></tr>
-            <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>Updating files:  56% (48888/87300)
-</pre></td></tr>
-            <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>Updating files:  57% (49761/87300)
-</pre></td></tr>
-            <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>Updating files:  58% (50634/87300)
-</pre></td></tr>
-            <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>Updating files:  59% (51507/87300)
-</pre></td></tr>
-            <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>Updating files:  60% (52380/87300)
-</pre></td></tr>
-            <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>Updating files:  61% (53253/87300)
-</pre></td></tr>
-            <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>Updating files:  62% (54126/87300)
-</pre></td></tr>
-            <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>Updating files:  63% (54999/87300)
-</pre></td></tr>
-            <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre>Updating files:  64% (55872/87300)
-</pre></td></tr>
-            <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre>Updating files:  65% (56745/87300)
-</pre></td></tr>
-            <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre>Updating files:  66% (57618/87300)
-</pre></td></tr>
-            <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre>Updating files:  67% (58491/87300)
-</pre></td></tr>
-            <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre>Updating files:  68% (59364/87300)
-</pre></td></tr>
-            <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre>Updating files:  68% (60218/87300)
-</pre></td></tr>
-            <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre>Updating files:  69% (60237/87300)
-</pre></td></tr>
-            <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre>Updating files:  70% (61110/87300)
-</pre></td></tr>
-            <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre>Updating files:  71% (61983/87300)
-</pre></td></tr>
-            <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre>Updating files:  72% (62856/87300)
-</pre></td></tr>
-            <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre>Updating files:  73% (63729/87300)
-</pre></td></tr>
-            <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre>Updating files:  74% (64602/87300)
-</pre></td></tr>
-            <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre>Updating files:  75% (65475/87300)
-</pre></td></tr>
-            <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre>Updating files:  76% (66348/87300)
-</pre></td></tr>
-            <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre>Updating files:  77% (67221/87300)
-</pre></td></tr>
-            <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre>Updating files:  78% (68094/87300)
-</pre></td></tr>
-            <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre>Updating files:  79% (68967/87300)
-</pre></td></tr>
-            <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre>Updating files:  80% (69840/87300)
-</pre></td></tr>
-            <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre>Updating files:  81% (70713/87300)
-</pre></td></tr>
-            <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre>Updating files:  82% (71586/87300)
-</pre></td></tr>
-            <tr class="" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre>Updating files:  83% (72459/87300)
-</pre></td></tr>
-            <tr class="" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre>Updating files:  84% (73332/87300)
-</pre></td></tr>
-            <tr class="" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre>Updating files:  84% (73758/87300)
-</pre></td></tr>
-            <tr class="" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre>Updating files:  85% (74205/87300)
-</pre></td></tr>
-            <tr class="" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre>Updating files:  86% (75078/87300)
-</pre></td></tr>
-            <tr class="" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre>Updating files:  87% (75951/87300)
-</pre></td></tr>
-            <tr class="" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre>Updating files:  88% (76824/87300)
-</pre></td></tr>
-            <tr class="" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre>Updating files:  89% (77697/87300)
-</pre></td></tr>
-            <tr class="" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre>Updating files:  90% (78570/87300)
-</pre></td></tr>
-            <tr class="" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre>Updating files:  91% (79443/87300)
-</pre></td></tr>
-            <tr class="" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre>Updating files:  92% (80316/87300)
-</pre></td></tr>
-            <tr class="" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre>Updating files:  93% (81189/87300)
-</pre></td></tr>
-            <tr class="" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre>Updating files:  94% (82062/87300)
-</pre></td></tr>
-            <tr class="" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre>Updating files:  95% (82935/87300)
-</pre></td></tr>
-            <tr class="" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre>Updating files:  96% (83808/87300)
-</pre></td></tr>
-            <tr class="" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre>Updating files:  97% (84681/87300)
-</pre></td></tr>
-            <tr class="" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre>Updating files:  98% (85554/87300)
-</pre></td></tr>
-            <tr class="" id="l103"><td><a href="#l103"><span>103</span></a></td><td><pre>Updating files:  99% (86427/87300)
-</pre></td></tr>
-            <tr class="" id="l104"><td><a href="#l104"><span>104</span></a></td><td><pre>Updating files: 100% (87300/87300)
-</pre></td></tr>
-            <tr class="" id="l105"><td><a href="#l105"><span>105</span></a></td><td><pre>Updating files: 100% (87300/87300), done.
-</pre></td></tr>
-            <tr class="" id="l106"><td><a href="#l106"><span>106</span></a></td><td><pre>*** syncing gentoo
-</pre></td></tr>
-            <tr class="" id="l107"><td><a href="#l107"><span>107</span></a></td><td><pre>*** synced gentoo
-</pre></td></tr>
-            <tr class="" id="l108"><td><a href="#l108"><span>108</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
-            <tr class="" id="l109"><td><a href="#l109"><span>109</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
-            <tr class="" id="l110"><td><a href="#l110"><span>110</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
-            <tr class="" id="l111"><td><a href="#l111"><span>111</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo
-</pre></td></tr>
-            <tr class="" id="l112"><td><a href="#l112"><span>112</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>