diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-05-07 07:19:53 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-05-07 07:19:53 +0000 |
| commit | 78fc156b676a19eed58208d216d340fa0e8371d6 (patch) | |
| tree | dded81229f066df11f46b774a45b3792e25ef0fc /ago.html | |
| parent | 2021-05-07T07:00:01Z (diff) | |
| download | repos-78fc156b676a19eed58208d216d340fa0e8371d6.tar.gz repos-78fc156b676a19eed58208d216d340fa0e8371d6.tar.bz2 repos-78fc156b676a19eed58208d216d340fa0e8371d6.zip | |
2021-05-07T07:15:01Z
Diffstat (limited to 'ago.html')
| -rw-r--r-- | ago.html | 42 |
1 files changed, 35 insertions, 7 deletions
@@ -44,19 +44,47 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing ago </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Already up to date. + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>From https://anongit.gentoo.org/git/dev/ago </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced ago + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + d97a69a...dbfe633 master -> origin/master (forced update) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>hint: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>hint: discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>hint: commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ago + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>hint: </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>hint: git config pull.rebase false # merge (the default strategy) +</pre></td></tr> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>hint: git config pull.rebase true # rebase +</pre></td></tr> + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>hint: git config pull.ff only # fast-forward only +</pre></td></tr> + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>hint: +</pre></td></tr> + <tr class="" id="l28"><td><a href="#l28"><span>28</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="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>hint: preference for all repositories. You can also pass --rebase, --no-rebase, +</pre></td></tr> + <tr class="" id="l30"><td><a href="#l30"><span>30</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="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>hint: invocation. +</pre></td></tr> + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. +</pre></td></tr> + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced ago +</pre></td></tr> + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded +</pre></td></tr> + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1 +</pre></td></tr> + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD +</pre></td></tr> + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ago +</pre></td></tr> + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> |