947
edits
Auto-tools/Projects/Mozmill/RepoSetup: Difference between revisions
Jump to navigation
Jump to search
Auto-tools/Projects/Mozmill/RepoSetup (view source)
Revision as of 17:56, 24 August 2012
, 24 August 2012→Ready to Push: update for new repo location
(→Setting up for Development on 1.5: update location of repo) |
(→Ready to Push: update for new repo location) |
||
| Line 71: | Line 71: | ||
</pre> | </pre> | ||
Ok, you've gotten your review, your commits are in good shape, and your commit message is correct, then you're ready to push, let's say you want to push to | Ok, you've gotten your review, your commits are in good shape, and your commit message is correct, then you're ready to push, let's say you want to push to mozilla/master: | ||
<pre> | <pre> | ||
git checkout master // Switch to master branch | git checkout master // Switch to master branch | ||
git pull --rebase | git pull --rebase mozilla master // Ensure your master is up to date: see below... | ||
git merge myfeature // Merges your commits to the master | git merge myfeature // Merges your commits to the master | ||
git push origin master // Pushes to your fork | git push origin master // Pushes to your fork | ||
git push | git push mozilla master // Pushes to mozilla master | ||
// PARTY! | // PARTY! | ||
</pre> | </pre> | ||