diff --git a/handbook/troggle/troglaptop.html b/handbook/troggle/troglaptop.html index 0106a7445..48ce20804 100644 --- a/handbook/troggle/troglaptop.html +++ b/handbook/troggle/troglaptop.html @@ -78,10 +78,11 @@ development system. We should copy that in the first instance. Alas, we haven't

Configuring git

On a new machine you need to configure your git identity:

git config --global user.email "you@example.com"
-  
 git config --global user.name "Your Name"
+git config --global pull.rebase true
 
+

We use pull.rebase as this seems to work best with our repos and the way we work.

Installing python

XKCD python install