Commit 58cd80bc authored by Nigel Kukard's avatar Nigel Kukard
Browse files

Added section on using cherry-pick'ing

parent f0f6054d
......@@ -39,7 +39,7 @@ For each separate change you going to make you must create a branch...
git checkout upstream/master -b your-change-name
```
### Committing You Changes
### Committing Your Changes
The first thing you need to do is review your changes using the following command...
```sh
......@@ -61,10 +61,23 @@ Type ? at the prompt to get further help. The (e)dit option is VERY useful to pu
#### Removing Hunk-By-Hunk
If you mistakenly git add --patch a wrong hunk or need to ammend it use the following...
```sh
git reset --patch <filename>
```
#### Cherry-picking Your Changes
Sometimes you may find you have a commit in another branch you wish to submit, this is very easy to do. Git has a cherry-pick command which will fetch the commit and apply it to the branch you're in.
```sh
git cherry-pick de20a8566bf7a996d4bc8bde997fc359560f2b28
```
Remember to review the number of commits in your MR. Typically there should only be 1. See the below section about "Squashing Your Commits".
## Submitting Your Changes
Be sure to read the code [Submission Policy](https://gitlab.devlabs.linuxassist.net/allworldit/allworldit/blob/master/Submission%20Policy.md)
......
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