diff options
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: |