diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-06-26 17:25:26 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-06-26 17:25:26 +0000 |
commit | 32ed74e6db1fdbc5d16fd9dcbc132cbd58a4beaa (patch) | |
tree | 085e1c9e8d8e6f35a2642f0f089b8672fb7842a8 /goduck777.html | |
parent | 2021-06-26T17:00:01Z (diff) | |
download | repos-32ed74e6db1fdbc5d16fd9dcbc132cbd58a4beaa.tar.gz repos-32ed74e6db1fdbc5d16fd9dcbc132cbd58a4beaa.tar.bz2 repos-32ed74e6db1fdbc5d16fd9dcbc132cbd58a4beaa.zip |
2021-06-26T17:15:01Z
Diffstat (limited to 'goduck777.html')
-rw-r--r-- | goduck777.html | 76 |
1 files changed, 16 insertions, 60 deletions
diff --git a/goduck777.html b/goduck777.html index 13febc3d75e5..12b70bc3cf3c 100644 --- a/goduck777.html +++ b/goduck777.html @@ -50,81 +50,37 @@ </pre></td></tr> <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>From https://github.com/goduck777/gentoo-overlay </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + 577fcb7...e1403ca master -> origin/master (forced update) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> e1403ca..ac65b1b master -> origin/master </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>hint: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>Updating e1403ca..ac65b1b </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>hint: discouraged. You can squelch this message by running one of the following + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Fast-forward </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>hint: commands sometime before your next pull: + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> dev-python/pyfzf/Manifest | 1 + </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>hint: + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> dev-python/pyfzf/metadata.xml | 14 ++++++++++++++ </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>hint: git config pull.rebase false # merge (the default strategy) + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> dev-python/pyfzf/pyfzf-0.2.2.ebuild | 20 ++++++++++++++++++++ </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>hint: git config pull.rebase true # rebase + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> 3 files changed, 35 insertions(+) </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>hint: git config pull.ff only # fast-forward only + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> create mode 100644 dev-python/pyfzf/Manifest </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>hint: + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> create mode 100644 dev-python/pyfzf/metadata.xml </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>hint: You can replace "git config" with "git config --global" to set a default + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> create mode 100644 dev-python/pyfzf/pyfzf-0.2.2.ebuild </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>hint: preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced goduck777 </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>hint: or --ff-only on the command line to override the configured default per + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>hint: invocation. + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Committer identity unknown + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 goduck777 </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>*** Please tell me who you are. -</pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> -</pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>Run -</pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> -</pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> git config --global user.email "you@example.com" -</pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> git config --global user.name "Your Name" -</pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> -</pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>to set your account's default identity. -</pre></td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Omit --global to set the identity only in this repository. -</pre></td></tr> - <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> -</pre></td></tr> - <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>fatal: empty ident name (for <repomirrorci@jacamar.gentoo.org>) not allowed -</pre></td></tr> - <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>!!! failed syncing goduck777 -</pre></td></tr> - <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync failed with 1 -</pre></td><td>[FATAL]</td></tr> - <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Will try to re-create -</pre></td></tr> - <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync goduck777 -</pre></td></tr> - <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing goduck777 -</pre></td></tr> - <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into '/var/lib/repo-mirror-ci/sync/goduck777'... -</pre></td></tr> - <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced goduck777 -</pre></td></tr> - <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded after re-adding -</pre></td></tr> - <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1 -</pre></td></tr> - <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD -</pre></td></tr> - <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 goduck777 -</pre></td></tr> - <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> |