diff options
| author | Owen Jacobson <owen.jacobson@grimoire.ca> | 2013-01-16 14:56:27 -0500 |
|---|---|---|
| committer | Owen Jacobson <owen.jacobson@grimoire.ca> | 2013-01-16 14:56:27 -0500 |
| commit | 3d896569309b5cd5df0821c57ee007809be89010 (patch) | |
| tree | 249791f4fbe0ad13dd809e358e7be6a03724acfc /wiki/git | |
| parent | f22a065c1f0b9bed89b99b7e2c70b537eb151d96 (diff) | |
Test merges? Use rerere.
Diffstat (limited to 'wiki/git')
| -rw-r--r-- | wiki/git/survival.md | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/wiki/git/survival.md b/wiki/git/survival.md index db601f5..e64273d 100644 --- a/wiki/git/survival.md +++ b/wiki/git/survival.md @@ -39,6 +39,9 @@ will screw you. Here are a few things I've picked up that have saved my bacon. git checkout foo git branch -D test-merge-foo + You can combine this with `git rerere` to save time resolving conflicts in + a later "real", permanent merge. + * You can use `git checkout -p` to build new, tidy commits out of a branch laden with "wip" commits: |