alvaro/git-flight-rules
1
0
Fork 0
mirror of https://github.com/k88hudson/git-flight-rules.git synced 2025-03-10 12:48:43 -03:00
Code Issues Releases Wiki Activity

Merge pull request #109 from e-larrambebere/master

Browse Source 
Fixes minor style issues
This commit is contained in:
Richard Littauer 2017-11-06 08:42:43 -05:00 committed by GitHub
commit 868005ed17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -502,7 +502,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
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.
@ -510,7 +510,7 @@ Once you merge a pull request on github, it gives you the option to delete the m
$ 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:
@ -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.