4,348
edits
→Commands: making a pull request
add displaytitle |
→Commands: making a pull request |
||
| Line 41: | Line 41: | ||
$ git merge --verify-signatures -S signed-branch | $ git merge --verify-signatures -S signed-branch | ||
</source> | </source> | ||
= Workflows = | |||
== Making a pull request == | |||
1. Fork the project | |||
2. Clone your fork | |||
<source lang="console"> | |||
$ git clone git@gitrepo.com:mhan/forkedproject.git | |||
</source> | |||
3. Set up environment to keep fork updated | |||
Set up upstream remote: | |||
<source lang="console"> | |||
$ git remote add upstream git@gitrepo.com:unmit/project.git | |||
</source> | |||
Update your fork: | |||
<source lang="console"> | |||
$ git fetch upstream | |||
$ git branch -va | |||
$ git checkout master | |||
$ git merge upstream/master | |||
</source> | |||
4. Make updates of your own | |||
Create a new branch before making any changes | |||
<source lang="console"> | |||
$ git checkout master | |||
$ git branch newfeature | |||
$ git checkout newfeature | |||
</source> | |||
5. Submit a pull request | |||
Rebase your development branch against upstream master branch. | |||
<source lang="console"> | |||
$ git fetch upstream | |||
$ git checkout master | |||
$ git merge upstream/master | |||
$ git checkout newfeature | |||
$ git rebase master | |||
</source> | |||
Squash multiple commits into fewer commits | |||
<source lang="console"> | |||
$ git checkout | |||
$ git rebase -i master | |||
</source> | |||
Submit | |||
* After pushing to the forked project, select development branch and click the pull request button. | |||
= Commands = | = Commands = | ||