Commit ca0cc8c8 authored by Nigel Kukard's avatar Nigel Kukard
Browse files

Added command for squshing to a ref

parent 8d5756e7
......@@ -86,7 +86,7 @@ Using the web interface you can then create a merge request:
* Click on your repository, click "Create Merge Request"
* Select the repository and branch on the top left and top right
* Type in a description of your changes
* Click "Submit merge request"
* Click "Submit merge request"
## Post-Review Changes
......@@ -100,11 +100,19 @@ Go through each comment one by one and commit the fixes as required.
You do NOT want to submit 20,000 commits, squashing will take all the changes and squash them into 1 commit. Replace X with how many extra comments you made PLUS 1 to include your original commit.
To squash all commits since "master", use...
```sh
git rebase -i master
```
To squash X number of commits use the following...
```sh
git rebase -i HEAD~X
```
You will be presented with a list of commits. Replace `pick` with `s` on all but your original commit. The next step will present you with a commit message with all your commit messages included for edit.
In all cases will be presented with a list of commits. Replace `pick` with `s` on all but your original commit. The next step will present you with a commit message with all your commit messages included for edit.
### Re-Submitting
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment