Clarify when is not recommended to rebase #1153
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ben
reviewed
Jan 3, 2019
| If you are using `git pull` and want to make `--rebase` the default, you can set the `pull.rebase` config value with something like `git config --global pull.rebase true`. | ||
|
|
||
| If you treat rebasing as a way to clean up and work with commits before you push them, and if you only rebase commits that have never been available publicly, then you'll be fine. | ||
| If you treat rebasing as a way to clean up and work with commits before anyone could have based work on them, either because they have not been available publicly or it is a branch that you are the only one supposed to work on, then you'll be fine. |
There was a problem hiding this comment.
What about something more like this:
If you only ever rebase commits that have never left your own computer, you'll be just fine.
If you rebase commits that have been pushed, but that no one else has based commits from, you'll also be fine.
There was a problem hiding this comment.
Sounds good to me, it clearly cover the two options, rebase of local commits and rebase of commits that you are the only one working on them.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull requests wants to fix #1152 regarding when a user should and should not be doing rebase.
I have form it in a way trying to minimize the additions in the book.
Another option would be to add some section about how git and rebase can play a role in continous integration systems.
I am not native english, it would be great if some native english could review it.