Skip to content

Commit

Permalink
Replaced master with main in the git-cheat-sheet.md file' (#1200)
Browse files Browse the repository at this point in the history
  • Loading branch information
iMichaela authored Apr 15, 2022
1 parent bfcd008 commit 0408517
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions git-cheat-sheet.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ To add the OSCAL repo as a remote named "upstream":
git remote add upstream https://github.com/usnistgov/OSCAL.git
```

## Update local master branch
## Update local "main" branch

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

## Updating a feature branch

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

Switch to the feature branch.

Expand Down

0 comments on commit 0408517

Please sign in to comment.