Git Usage Notes

Git Usage Notes

This article contains some notes of git usage.

Show Log

Show remote logs: git log remote/branch

Merge

git merge is always operating on current branch. Other branches will not be affected.

Make sure two branches involved in merging are up-to-date with latest remote changes.

git merge other-branch will merge other-branch into current branch. Fast-forward merge is first tried, then 3-way merge.

Push

Push all branches to remote: git push <remote> --all Push all tags to remote: git push <remote> --tags Delete remote branch: git push <remote> --delete <branch>

-u or --set-upstream: Add upstream(tracking) reference.