Skip to content

Latest commit

 

History

History
34 lines (23 loc) · 606 Bytes

GIT CHEAT-SHEET.md

File metadata and controls

34 lines (23 loc) · 606 Bytes

Keeping your fork up-to-date

Track the upstream

Show remotes:

git remote -v

If you have not configured the upstream, it will not appear in this list.

To add the OSCAL repo as a remote named "upstream":

git remote add upstream https://github.com/usnistgov/OSCAL.git

Update local master branch

git checkout master
git pull
git fetch upstream
git rebase upstream/master

Updating a feature branch

First make sure that your local master branch is up-to-date with the upstream as described above.

Switch to the feature branch.

git checkout <feature-branch-name>