Commit 740bd63f authored by Nigel Kukard's avatar Nigel Kukard
Browse files

Small update to use descriptive branch names

parent d07c34a7
......@@ -65,7 +65,7 @@ Make sure your code is based off the main repo and push your branch...
git fetch upstream
git checkout yourbranchname
git rebase upstream/master
git push origin yourbranchname:yourbranchname
git push origin yourbranchname:descriptive-name
```
### Submit Upstream
......@@ -99,7 +99,7 @@ You will be presented with a list of commits. Replace `pick` with `s` on all but
You can now re-submit your changes by forcing a ref update...
```
git push -f origin LOCAL_BRANCH:SAME_REMOTE_BRANCH_AS_BEFORE
git push -f origin yourbranchname:same-descriptive-name
```
## Further Changes
......@@ -113,7 +113,7 @@ Branch the original repo and apply your changes to it.
```sh
git fetch upstream
git checkout upstream/master -b yourbranchname
git push origin yourbranchname:yourbranchname
git push origin yourbranchname:descriptive-name
```
### Merge Main Repo
......@@ -126,5 +126,5 @@ git pull
git fetch upstream
git merge upstream/master
git checkout master -b yourbranchname
git push origin yourbranchname:yourbranchname
```
git push origin yourbranchname:descriptive-name
```
\ No newline at end of file
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