diff options
Diffstat (limited to 'science.html')
| -rw-r--r-- | science.html | 58 |
1 files changed, 37 insertions, 21 deletions
diff --git a/science.html b/science.html index da5b9e93cc4a..c6ab2db40b75 100644 --- a/science.html +++ b/science.html @@ -66,47 +66,63 @@ </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ pmaint sync science </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', 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="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <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>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>invocation. + <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> + <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Already up to date. + <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>*** syncing science + <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>From https://anongit.gentoo.org/git/proj/sci </pre></td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** synced science + <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> 804301903..92beb1e78 master -> origin/master </pre></td></tr> - <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Updating 804301903..92beb1e78 </pre></td></tr> - <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Fast-forward </pre></td></tr> - <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> .../scilab/files/scilab-6.1.0-libxml.patch | 66 ++++++++++++++++++++++ </pre></td></tr> - <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 science + <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> sci-mathematics/scilab/scilab-6.1.0.ebuild | 1 + </pre></td></tr> - <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> 2 files changed, 67 insertions(+) +</pre></td></tr> + <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> create mode 100644 sci-mathematics/scilab/files/scilab-6.1.0-libxml.patch +</pre></td></tr> + <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing science +</pre></td></tr> + <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** synced science +</pre></td></tr> + <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Sync succeeded +</pre></td></tr> + <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git log --format=%ci -1 +</pre></td></tr> + <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD +</pre></td></tr> + <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 science +</pre></td></tr> + <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> |