diff options
Diffstat (limited to 'pixlra.html')
| -rw-r--r-- | pixlra.html | 40 |
1 files changed, 8 insertions, 32 deletions
diff --git a/pixlra.html b/pixlra.html index d5edd6426bf7..0ad5d95afb4c 100644 --- a/pixlra.html +++ b/pixlra.html @@ -54,45 +54,21 @@ </pre></td></tr> <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>From https://anongit.gentoo.org/git/user/carreira </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + 998da37...a9ef387 master -> origin/master (forced update) + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> a9ef387..998da37 master -> origin/master </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>hint: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>hint: discouraged. You can squelch this message by running one of the following + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** synced pixlra </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>hint: commands sometime before your next pull: + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>hint: + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>hint: git config pull.rebase false # merge (the default strategy) + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>hint: git config pull.rebase true # rebase + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pixlra </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>hint: git config pull.ff only # fast-forward only -</pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>hint: -</pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>hint: You can replace "git config" with "git config --global" to set a default -</pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>hint: preference for all repositories. You can also pass --rebase, --no-rebase, -</pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>hint: or --ff-only on the command line to override the configured default per -</pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>hint: invocation. -</pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>Already up to date. -</pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>*** synced pixlra -</pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Sync succeeded -</pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ git log --format=%ci -1 -</pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD -</pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pixlra -</pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> |