From 7d3cbad94203c74c2174a10f1b66d6d5d0bbb76a Mon Sep 17 00:00:00 2001
From: Peter Teuben <teuben@gmail.com>
Date: Thu, 21 Jul 2016 19:24:13 -0400
Subject: [PATCH] final final now.

---
 git.txt | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/git.txt b/git.txt
index c6888ee..9c98b58 100644
--- a/git.txt
+++ b/git.txt
@@ -91,6 +91,8 @@ C: collaborate on a git project
 
     #  5) now do your work, test that everything works etc.
     vi contributors
+    git diff contributors
+    tkdiff contributors            # example program that knows about 'git'
     git commit contributors
     
     mkdir MyCode
@@ -112,6 +114,33 @@ C: collaborate on a git project
     git push origin --delete test1
 
 
+Finally:
+    Put some useful things in your ~/.gitconfig file, e.g. via
+    	     git config --global user.name "Peter Teuben"
+    	     git config --global user.email  teuben@gmail.com
+    etc. etc.
+    
+
+[user]
+	email = teuben@gmail.com
+	name = Peter Teuben
+[credential]
+	helper = cache --timeout 10000
+[core]
+	editor = mem
+[merge]
+	tool = meld
+[push]
+	default = simple
+[color]
+	diff = auto
+	status = auto
+	branch = auto
+[alias]
+	ci = commit
+	co = checkout
+
+
 
 Questions: