mirror of
https://github.com/k88hudson/git-flight-rules.git
synced 2025-03-10 12:48:43 -03:00
Fixes minor style issues
Adds some missing closure tags to the section anchors. This was causing some issues rendering the README
This commit is contained in:
parent
2a86ef478e
commit
051e40b042
@ -501,7 +501,7 @@ 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
|
### 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.
|
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.
|
||||||
|
|
||||||
@ -509,7 +509,7 @@ Once you merge a pull request on github, it gives you the option to delete the m
|
|||||||
$ git fetch -p
|
$ git fetch -p
|
||||||
```
|
```
|
||||||
|
|
||||||
<a name='restore-a-deleted-branch'>
|
<a name='restore-a-deleted-branch'></a>
|
||||||
### I accidentally deleted my branch
|
### 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:
|
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:
|
||||||
@ -603,7 +603,7 @@ To delete a local branch:
|
|||||||
|
|
||||||
## Rebasing and Merging
|
## Rebasing and Merging
|
||||||
|
|
||||||
<a name="undo-rebase">
|
<a name="undo-rebase"></a>
|
||||||
### I want to undo rebase/merge
|
### 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.
|
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.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user