Git Merging

2019-11-06

A quick refresher on some common git commands we use at EyeSpace.

merge

The merge command is used to integrate changes from another branch. The target of this integration (i.e. the branch that receives changes) is always the currently checked out HEAD branch.

git merge xxx

delete tag

Delete local and remote tag:

From here

git tag -d 12345
git push origin :refs/tags/12345

rebase

git rebase -i &lt;after-this-commit&gt;

and replace “pick” on the second and subsequent commits with “squash” or “fixup”, as described in the manual.

In this example, <after-this-commit> is either the SHA1 hash or the relative location from the HEAD of the current branch from which commits are analyzed for the rebase command.

For example, if the user wishes to view 5 commits from the current HEAD in the past the command is git rebase -I HEAD~5

checkout only file/directory from branch

git checkout feature-branch -- src/js/some-file.js