From 416194886234c8544353eb5dbb7d4b188f18b53e Mon Sep 17 00:00:00 2001
From: Expo on server <expo@expo.survex.com>
Date: Sat, 12 Nov 2022 15:04:26 +0000
Subject: [PATCH] added pull.rebase setting - online edit of
 handbook/troggle/troglaptop.html

---
 handbook/troggle/troglaptop.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
 <h2 id="git">Configuring git</h2>
 <p>On a new machine you need to configure your git identity:
   <pre><code>git config --global user.email "you@example.com"
-  
 git config --global user.name "Your Name"
+git config --global pull.rebase true
 </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>
 <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>