From 9de3be0c1ab53118f2086cddf9c0a5cac8df686c Mon Sep 17 00:00:00 2001 From: Owen Jacobson Date: Wed, 16 Jan 2013 14:33:07 -0500 Subject: Added some notes on how I configure git. --- wiki/git/survival.md | 1 + 1 file changed, 1 insertion(+) (limited to 'wiki/git/survival.md') diff --git a/wiki/git/survival.md b/wiki/git/survival.md index 79f10d0..3ac1abe 100644 --- a/wiki/git/survival.md +++ b/wiki/git/survival.md @@ -8,6 +8,7 @@ will screw you. Here are a few things I've picked up that have saved my bacon. * `git push` and `git pull` are **not symmetric**. `git push`'s opposite operation is `git fetch`. (`git pull` is equivalent to `git fetch` followed by `git merge`, more or less). +* [Git configuration values don't always have the best defaults](config). * You probably don't want to use a merge operation (such as `git pull`) to integrate upstream changes into topic branches. The resulting history can be very confusing to follow, especially if you integrate upstream changes -- cgit v1.2.3