Fri, 18 Nov 2022

Git cheat sheet

Git for daily use.
Updated as needed.

Sync with remote master branch (merge)

Download new changes and merge them:

git pull origin master

If one want to rebase rather than merge:

git pull origin master --rebase

Keep local HEAD branch and working copy files untouched:

git fetch origin

Clean merge process

git checkout test
git pull 
git checkout master
git pull
git merge --no-ff --no-commit test

Cancel a merge with conflicts

git merge --abort

Tagging

create the tag

git tag -a MY_TAG -m "something" -m "another line"

OR

git tag -a MY_TAG -F <comment_file>

push the tag

git push origin --tags

OR

git push origin  MY_TAG

Remove Tag

Local tag first

git tag -d <tagname>

An then remote tag

git push --delete origin <tagname>

Branching

git checkout -b <my_branch>

Undo git add

git reset <file>

Amend a commit

git add history.txt
git commit --amend --no-edit
git push --force

History of one file

git log -p -- <file_path>

Archive/close a branch

You can tag the tip of the branch by archiving it, and then delete the branch.

git tag archive/<branchname> <branchname>
git branch -d <branchname>
git checkout master

The branch will be deleted, and can be retrieved later by checking out the tag, and recreating the branch.

git checkout archive/<branchname>
git checkout -b new_branch_name

Or more simply :

git checkout -b new_branch_name archive/<branchname>

Do not forget to share the tag to the server

git push archive/<branchname>

or to push all your tags

git push --tags

Force complete sync to master

Hard reset will lost all uncommitted and committed changes.

git fetch origin master
git reset --hard origin/master