Git_Basics.rst: Update interactive rebase section #6126
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
Expands `squashing your commits` section to explain different interactive rebase commands Closes coala#3930
abhishalya
requested changes
May 14, 2021
| Squashing your commits | ||
| ---------------------- | ||
| Interactive Rebasing | ||
| --------------------- |
There was a problem hiding this comment.
Suggested change
| --------------------- | |
| -------------------- |
| Rewording | ||
| --------- | ||
|
|
||
| Equivalent to the `git commit --amend` except it applies to the specified commit. Use |
There was a problem hiding this comment.
Suggested change
| Equivalent to the `git commit --amend` except it applies to the specified commit. Use | |
| Equivalent to the ``git commit --amend`` except it applies to the specified commit. Use |
| them down into a single commit with the interactive rebasing tool. To squash | ||
| your commits run the following command: | ||
|
|
||
| Keep the first one |
There was a problem hiding this comment.
This line is a bit too small, we can restructure this paragraph a bit to not waste any line space.
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.
Expands
squashing your commitssection to explain differentinteractive rebase commands
Closes #3930
For short term contributors: we understand that getting your commits well
defined like we require is a hard task and takes some learning. If you
look to help without wanting to contribute long term there's no need
for you to learn this. Just drop us a message and we'll take care of brushing
up your stuff for merge!
Checklist
them.
individually. It is not sufficient to have "fixup commits" on your PR,
our bot will still report the issues for the previous commit.) You will
likely receive a lot of bot comments and build failures if coala does not
pass on every single commit!
After you submit your pull request, DO NOT click the 'Update Branch' button.
When asked for a rebase, consult coala.io/rebase
instead.
Please consider helping us by reviewing other peoples pull requests as well:
corobo mark wip <URL>to get it outof the review queue.
The more you review, the more your score will grow at coala.io and we will
review your PRs faster!