OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-22 16:40:05 +00:00
Code Issues Projects Releases Wiki Activity

Rebase info

Adityarup Laha 2018-04-14 13:07:08 +05:30
parent 8963a98338
commit b9b12ab4bc
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Typical-Git-Workflow.md

@ -39,6 +39,8 @@ It's appreciated if every single commit in a branch on its own compiles on all s
* From your branch, rebase `upstream/master` * From your branch, rebase `upstream/master`
* `git checkout new-branch-name` * `git checkout new-branch-name`
* `git rebase -i upstream/master` * `git rebase -i upstream/master`
* Replace `pick` with `fixup` in all commits addressing feedback.
* Reword, reorder, resolve, if required.
* Update `origin/new-branch-name` * Update `origin/new-branch-name`
* `git push origin new-branch-name --force` * `git push origin new-branch-name --force`
* Create the pull request on GitHub to merge `origin/new-branch-name` into `upstream/master` * Create the pull request on GitHub to merge `origin/new-branch-name` into `upstream/master`