add squash option to git-feature #829
Merged
Conversation
This file contains 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
spacewander
requested changes
Apr 4, 2020
man/git-feature.md
Outdated
| @@ -40,7 +44,7 @@ git-feature(1) -- Create/Merge feature branch | |||
| $ git features dependencies | |||
| $ (features/dependencies) ... | |||
| $ (features/dependencies) git checkout master | |||
| $ git features finish dependencies | |||
| $ git features finish --squash dependencies | |||
There was a problem hiding this comment.
Maybe we can show both commands with/without squash in the example?
Like git features finish dependencies # Or 'git features finish --squash dependencies'
And it would be better if you can compare the default merge mode with the squash one in the documentation.
spacewander
approved these changes
Apr 5, 2020
|
@cpradog |
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.
No description provided.