diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-04-11 15:54:17 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-04-11 15:54:17 +0000 |
| commit | f99fc8e8d3a99be8f24da947d83f3fd485b126f7 (patch) | |
| tree | 2c57971e24a6fc832f6cabc5897dd70c1a014ef5 /oubliette.html | |
| parent | 2021-04-11T15:30:01Z (diff) | |
| download | repos-f99fc8e8d3a99be8f24da947d83f3fd485b126f7.tar.gz repos-f99fc8e8d3a99be8f24da947d83f3fd485b126f7.tar.bz2 repos-f99fc8e8d3a99be8f24da947d83f3fd485b126f7.zip | |
2021-04-11T15:45:01Z
Diffstat (limited to 'oubliette.html')
| -rw-r--r-- | oubliette.html | 98 |
1 files changed, 28 insertions, 70 deletions
diff --git a/oubliette.html b/oubliette.html index 896fad92986e..d4bbadd42011 100644 --- a/oubliette.html +++ b/oubliette.html @@ -34,103 +34,61 @@ </pre></td></tr> <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync oubliette </pre></td></tr> - <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing oubliette + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </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>*** syncing oubliette </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>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>commands sometime before your next pull: + <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> + <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 false # merge (the default strategy) + <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.rebase true # rebase + <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> git config pull.ff only # fast-forward only + <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> + <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>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> </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>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>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>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>invocation. + <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> + <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>From https://github.com/nabbi/oubliette-overlay + <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> 9b71779..6feb967 master -> origin/master + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>From https://github.com/nabbi/oubliette-overlay </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Updating 9b71779..6feb967 + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> 6feb967..d0f9faf master -> origin/master </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>Updating 6feb967..d0f9faf </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> sys-devel/distcc/Manifest | 12 ++ + <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> sys-devel/distcc/distcc-3.3.5.ebuild | 180 +++++++++++++++++++ + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> sys-devel/distcc/Manifest | 2 +- </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> sys-devel/distcc/files/distcc-3.0-xinetd.patch | 15 ++ + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> sys-devel/distcc/distcc-3.3.5.ebuild | 5 +++++ </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> sys-devel/distcc/files/distcc-3.2_rc1-socks5.patch | 191 +++++++++++++++++++++ + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> 2 files changed, 6 insertions(+), 1 deletion(-) </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> .../files/distcc-3.3.5-no-rewrite-chost.patch | 28 +++ + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced oubliette </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> sys-devel/distcc/files/distcc-config | 180 +++++++++++++++++++ + <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> sys-devel/distcc/files/distcc-hardened.patch | 24 +++ + <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> sys-devel/distcc/files/distccd.confd | 42 +++++ + <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> sys-devel/distcc/files/distccd.initd | 15 ++ + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 oubliette </pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> sys-devel/distcc/files/distccd.service-1 | 10 ++ -</pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> sys-devel/distcc/files/distccd.service.conf | 6 + -</pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> sys-devel/distcc/metadata.xml | 15 ++ -</pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> 12 files changed, 718 insertions(+) -</pre></td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> create mode 100644 sys-devel/distcc/Manifest -</pre></td></tr> - <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> create mode 100644 sys-devel/distcc/distcc-3.3.5.ebuild -</pre></td></tr> - <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> create mode 100644 sys-devel/distcc/files/distcc-3.0-xinetd.patch -</pre></td></tr> - <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> create mode 100644 sys-devel/distcc/files/distcc-3.2_rc1-socks5.patch -</pre></td></tr> - <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> create mode 100644 sys-devel/distcc/files/distcc-3.3.5-no-rewrite-chost.patch -</pre></td></tr> - <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> create mode 100644 sys-devel/distcc/files/distcc-config -</pre></td></tr> - <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> create mode 100644 sys-devel/distcc/files/distcc-hardened.patch -</pre></td></tr> - <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> create mode 100644 sys-devel/distcc/files/distccd.confd -</pre></td></tr> - <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> create mode 100644 sys-devel/distcc/files/distccd.initd -</pre></td></tr> - <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> create mode 100644 sys-devel/distcc/files/distccd.service-1 -</pre></td></tr> - <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> create mode 100644 sys-devel/distcc/files/distccd.service.conf -</pre></td></tr> - <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> create mode 100644 sys-devel/distcc/metadata.xml -</pre></td></tr> - <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** synced oubliette -</pre></td></tr> - <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Sync succeeded -</pre></td></tr> - <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git log --format=%ci -1 -</pre></td></tr> - <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD -</pre></td></tr> - <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 oubliette -</pre></td></tr> - <tr class="" id="l61"><td><a href="#l61"><span>61</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> |