Changes between Version 33 and Version 34 of CollaborateOnGithub

Timestamp:

Jan 12, 2010, 10:26:22 AM (16 years ago)

Author:

mrts

Comment:

--

CollaborateOnGithub

@@ -52 +52 @@
  }}}
 
-=== 2. Register an account on !GitHub ===
+=== 2. Configure recommended defaults ===
+
+(From http://cheat.errtheblog.com/s/git)
+
+Tell `git branch` and `git checkout` to setup new branches so that `git pull` will appropriately merge from that remote branch. Without this, you will have to add `--track` to your branch command or manually merge remote tracking branches with `fetch` and then `merge`
+{{{
+git config branch.autosetupmerge true
+}}}
+or globally
+{{{
+git config --global branch.autosetupmerge true
+}}}
+
+Possibly set your username:
+{{{
+git config --global user.name 'John Doe'
+git config --global user.email johndoe@example.com
+}}}
+
+=== 3. Register an account on !GitHub ===
 
 Go to https://github.com/signup/free and follow the instructions.