diff options
| author | Owen Jacobson <owen.jacobson@grimoire.ca> | 2013-01-16 14:33:07 -0500 |
|---|---|---|
| committer | Owen Jacobson <owen.jacobson@grimoire.ca> | 2013-01-16 14:33:07 -0500 |
| commit | 9de3be0c1ab53118f2086cddf9c0a5cac8df686c (patch) | |
| tree | 35dcfbd8200710ac0b49a328a67b4e03b063681a /wiki/git/survival.md | |
| parent | c13e10fa5c4fa2f75a28a097f60f4a5a2428889e (diff) | |
Added some notes on how I configure git.
Diffstat (limited to 'wiki/git/survival.md')
| -rw-r--r-- | wiki/git/survival.md | 1 |
1 files changed, 1 insertions, 0 deletions
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 |