Skip to content

Latest commit

 

History

History
46 lines (30 loc) · 1.47 KB

git_workflow.md

File metadata and controls

46 lines (30 loc) · 1.47 KB

Configuring Git and GitHub

GitHub Settings

Git Configuration

Set global user, push and pull options. If you want to set options on a per-repository basis, omit --global.

git config --global user.name "Joe Smith"
git config --global user.email [email protected]
git config --global --bool pull.rebase true
git config --global push.default simple

Git Workflow

Fork

Fork ManageIQ/manageiq by clicking on the Fork button.

Clone

Once your fork has been created, clone it and create an upstream remote.

git clone [email protected]:<username>/manageiq.git
cd manageiq
git remote add upstream [email protected]:ManageIQ/manageiq.git
git fetch upstream

You can pull upstream changes into your local repository using pull.

git pull upstream master --ff

Pull Request

Once your changes are ready, open a Pull Request against the upstream project.