Git cheat sheet
From Simson Garfinkel
Jump to navigationJump to search
Make a signed tag and push to github
git tag -u 'Simson L. Garfinkel <simsong@acm.org>' -s tcpflow-1.2.7 -m 'Release 1.2.7' git push --tags
Pull changes
- from a forked repository's upstream
git fetch upstream # fetches any new changes from original repository git merge upstream/master # merges any changes fetched into your working files
or
git pull upstream
git pull automatically merges changes. With fetch and merge, the changes are fetched and stored locally, then merged when you request.