Skip to content

Commit

Permalink
Merge pull request k88hudson#109 from e-larrambebere/master
Browse files Browse the repository at this point in the history
Fixes minor style issues
  • Loading branch information
RichardLitt authored Nov 6, 2017
2 parents 688ab59 + 051e40b commit 868005e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -502,15 +502,15 @@ And finally, let's cherry-pick the commit for bug #14:
```


<a name="delete-stale-local-branches">
<a name="delete-stale-local-branches"></a>
### I want to delete local branches that were deleted upstream
Once you merge a pull request on github, it gives you the option to delete the merged branch in your fork. If you aren't planning to keep working on the branch, it's cleaner to delete the local copies of the branch so you don't end up cluttering up your working checkout with a lot of stale branches.

```sh
$ git fetch -p
```

<a name='restore-a-deleted-branch'>
<a name='restore-a-deleted-branch'></a>
### I accidentally deleted my branch

If you're regularly pushing to remote, you should be safe most of the time. But still sometimes you may end up deleting your branches. Let's say we create a branch and create a new file:
Expand Down Expand Up @@ -624,7 +624,7 @@ This will give you a local copy of the branch `daves`, and any update that has b

## Rebasing and Merging

<a name="undo-rebase">
<a name="undo-rebase"></a>
### I want to undo rebase/merge

You may have merged or rebased your current branch with a wrong branch, or you can't figure it out or finish the rebase/merge process. Git saves the original HEAD pointer in a variable called ORIG_HEAD before doing dangerous operations, so it is simple to recover your branch at the state before the rebase/merge.
Expand Down

0 comments on commit 868005e

Please sign in to comment.