How to use git1

1) Setup git:

# Set default name for git to use when you commit
git config --global user.name  "Name Surname"

# Set default email for git to use when you commit
git config --global user.email "[email protected]"

# Set git to use credential memory cache
git config --global credential.helper cache

# Line ending preferences
git config --global core.autocrlf false
git config --global core.safecrlf true

2) Add aliases to git configuration file ~/.gitconfig:

[alias]
  co   = checkout
  ci   = commit
  st   = status
  br   = branch
  hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
  type = cat-file -t
  dump = cat-file -p

3) Add aliases to bash profile file ~/.bashrc OR ~/.profile:

# Git aliases
alias gs='git status '
alias ga='git add '
alias gb='git branch '
alias gc='git commit'
alias gd='git diff'
alias go='git checkout '
alias gk='gitk --all&'
alias gx='gitx --all'

alias got='git '
alias get='git '

4) Clone repository:

git clone https://gitlab.com/mabalenk/rightsizer.git

5) Add files to local repository:

git add <files>

6) Stage changes for commit:

git add <files_changed>

git add -A  # stage all
git add .   # stage new and modified without deleted
git add -u  # stage modified and deleted without new

7) Unstage file for commit:

git reset <file_name>

8) Commit changes:

git commit -m "<commit_message>"  # OR
git commit -F  <log_file>

9) Push changes to git server:

git push

10) Obtain latest changes from git server:

git checkout
git pull

11) Amend comment for last commit:

git commit --amend -m "<new_commit_message>"

12) View branches:

git branch
git branch -a  # include remote branches

13) Create new branch:

git checkout -b <branch_name>
git push origin <branch_name>

14) Switch to another branch:

git checkout <branch_name>

15) Delete local branch:

git branch -d <branch_name>  # OR
git branch -D <branch_name>

16) Delete remote branch:

git push origin --delete <branch_name>

17) Merge one branch with another branch:

git checkout <branch1>
git merge    <branch2>
git push

18) Get version of file from given commit:

git checkout <commit_id> <file_name>

19) Switch to different commit temporarily:

git checkout <commit_id>

20) Revert to state of previous commit (everything done since then will be lost):

git reset --hard <commit_id>

21) Discard changes in working copy that are not in index:

git stash save --keep-index
git stash drop

22) Unstash changes:

git stash pop

23) Work with git stash:

# List stashed changes
git stash list

# View stash contents
git stash show

# Apply most recent stash
git stash apply

# Apply older stash 'n'
git stash apply stash@{n}

24) Recover deleted files, if no commit was made after delete:

git checkout .

25) Rename project on GitLab:

# Edit `.git/description` to set new project's name locally

# Rename directory containing git repository on local machine

# Rename repository in GitLab project settings

# Set new remote URL with git
git remote set-url origin [email protected]:<username>/<projectname>.git

26) Synchronise fork with upstream repository:

# List current remote repositories
git remote -v

# Add new remote repository
git remote add upstream <repository_name>

# Verify new remote
git remote -v

# Grab latest branches and changes from remote upstream
git fetch upstream

# List all local, remote-tracking branches
git branch -va

# Check out local master branch
git checkout master

# Merge upstream's master branch into local master
git merge upstream/master

# Push (merged) changes to local master
git push origin master

27) Push changes from fork master into remote upstream branch

git push upstream master:<remote_branch_name>

28) Reset repository to one commit less (rewind all files to -1 commit)

git reset --soft HEAD~1

29) Cancel previous commit

git reset @~

  1. Based on A, B, C, D, E, F, G, H, I, J and K. ↩