alvaro/git-flight-rules
1
0
Fork 0
mirror of https://github.com/k88hudson/git-flight-rules.git synced 2025-03-11 13:18:50 -03:00
Code Issues Releases Wiki Activity

Doctoc fixes. :|

Browse Source
This commit is contained in:
Richard Littauer 2015-03-16 13:18:19 -07:00
parent 6f9d0f8797
commit 974505558f
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
README.md
View File

@ -25,7 +25,19 @@ For clarity's sake all examples in this document use customized bash prompt in o
- [I need to combine commits](#i-need-to-combine-commits) - [I need to combine commits](#i-need-to-combine-commits)
- [Possible issues with merging](#possible-issues-with-merging) - [Possible issues with merging](#possible-issues-with-merging)
- [Safe merging strategy:](#safe-merging-strategy) - [Safe merging strategy:](#safe-merging-strategy)
- [some code](#some-code) - [I need to merge a branch into a single commit](#i-need-to-merge-a-branch-into-a-single-commit)
- [I want to combine only unpushed commits](#i-want-to-combine-only-unpushed-commits)
- [Possible issues with interactive rebases](#possible-issues-with-interactive-rebases)
- [The rebase editing screen says 'noop'](#the-rebase-editing-screen-says-noop)
- [There were conflicts](#there-were-conflicts)
- [When I try to push, I get an error message:](#when-i-try-to-push-i-get-an-error-message)
- [I committed with the wrong name and email configured](#i-committed-with-the-wrong-name-and-email-configured)
- [I committed to master instead of a new branch](#i-committed-to-master-instead-of-a-new-branch)
- [I made several commits on a single branch that should be on different branches](#i-made-several-commits-on-a-single-branch-that-should-be-on-different-branches)
- [I want to delete local branches that were deleted upstream](#i-want-to-delete-local-branches-that-were-deleted-upstream)
- [I accidentally deleted my branch](#i-accidentally-deleted-my-branch)
- [I want to add aliases for some git commands](#i-want-to-add-aliases-for-some-git-commands)
- [I pulled from/into the wrong branch](#i-pulled-frominto-the-wrong-branch)
<!-- END doctoc generated TOC please keep comment here to allow auto update --> <!-- END doctoc generated TOC please keep comment here to allow auto update -->
@ -134,7 +146,7 @@ If everything is successful, you should see something like this:
``` ```
### Possible issues with merging ### Possible issues with merging
#### Safe merging strategy: #### Safe merging strategy:
```--no-commit``` performs the merge but pretends the merge failed and does not autocommit, giving the user a chance to inspect and further tweak the merge result before committing. ```no-ff``` maintains evidence that a feature branch once existed, keeping project history consistent. `--no-commit` performs the merge but pretends the merge failed and does not autocommit, giving the user a chance to inspect and further tweak the merge result before committing. `no-ff` maintains evidence that a feature branch once existed, keeping project history consistent.
```sh ```sh
(master)$ git merge --no-ff --no-commit featurebranch (master)$ git merge --no-ff --no-commit featurebranch
@ -196,7 +208,6 @@ some code
========= =========
some code some code
>>>>>>> new-commit >>>>>>> new-commit
``` ```
You will need to resolve the differences between the code that was added in your new commit (in the example, everything from the middle line to `new-commit`) and your `HEAD`. You will need to resolve the differences between the code that was added in your new commit (in the example, everything from the middle line to `new-commit`) and your `HEAD`.