Update cheat-sheet with missing config

1 files changed, 7 insertions, 2 deletions

diff --git a/cheatsheet.txt b/cheatsheet.txt
index 8e18dd1..64d4442 100644
--- a/cheatsheet.txt
+++ b/cheatsheet.txt
@@ -1,6 +1,9 @@
 Global Setup
 
- See also Submodules below.
+ See also Submodules and History Cleanup configurations below.
+
+ git config --global user.name "First Last"
+ git config --global user.name first@example.com
 
  git config --global color.status.branch magenta
 
@@ -116,7 +119,9 @@ History Cleanup
   that usually the result of the git merge command.
 
   Note: make sure you have rerere enabled for this process to work
-  smoothly (~/.gitconfig).
+  smoothly:
+
+  git config --global rerere.enabled true
 
   Note: if you are just learning this procedure, make a local backup
   copy of your repository in case things go badly and you need to