expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2025-01-18 00:42:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

added pull.rebase setting - online edit of handbook/troggle/troglaptop.html

Browse Source
This commit is contained in:
Expo on server 2022-11-12 15:04:26 +00:00
parent 387b238455
commit 4161948862
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
handbook/troggle/troglaptop.html
View File

@ -78,10 +78,11 @@ development system. We should copy that in the first instance. Alas, we haven't
<h2 id="git">Configuring git</h2> <h2 id="git">Configuring git</h2>
<p>On a new machine you need to configure your git identity: <p>On a new machine you need to configure your git identity:
<pre><code>git config --global user.email "you@example.com" <pre><code>git config --global user.email "you@example.com"
git config --global user.name "Your Name" git config --global user.name "Your Name"
git config --global pull.rebase true
</pre></code> </pre></code>
<p>We use pull.rebase as this seems to work best with our repos and the way we work.
<h2 id="python">Installing python</h2> <h2 id="python">Installing python</h2>
<a href="https://xkcd.com/1987/"><img src="https://imgs.xkcd.com/comics/python_environment.png" align="right" hspace="20" width="230" alt='XKCD python install'></a> <a href="https://xkcd.com/1987/"><img src="https://imgs.xkcd.com/comics/python_environment.png" align="right" hspace="20" width="230" alt='XKCD python install'></a>