Basic git commands

Disclaimer

---

This document serve as a reference of git commands. Its organization follow a (kind of) logical order to help you to understand how git works from scratch, but notice that its just a reference. If you want to start from zero with git, I strongly recomend you to take a look in those links (In this order):

1. Try Git Tutorial;
2. Git-it;
3. The document that you're reading right now;
4. Roger Dudler - Git Guide;
5. Bruno Passos - Git commands;

Now that you know it, feel free to go through this document. I hope it help! 😎

Your information

---

View your info

git config user.name (See how your name is displayed in commits)
git config user.email (See what is your email showed in commits)

Setup your info in a single repository

git config user.name "Your name here"
git config user.email "[email protected]"

Global setup

This will set information to all repositories from your computer.
git config --global user.name "Your name here"
git config --global user.email "[email protected]"

Edit global ~/.gitconfig file

git config --global --edit

[+] More info about config

Workflow commands

---

Start a repo

git init
[+] More info about init

Set remote address to local repo

git remote add origin <URL> (Set repo origin)
git remote add upstream <URL> (Set upstream if you have it.)

See repo's status

git status
git status -s (Short version)
[+] More info about status

Revert modified files

git checkout "path/to/file.html" (Individual file)
git checkout . (All files)
[+] More info about checkout

Add changes to stage area

git add "path/to/file.html" (Individual file)
git add . (All files)"
[+] More info about add

Remove changes from stage area (And keep it as untracked)

git reset HEAD "path/to/file.html" (Individual file)
git reset HEAD . (All files)

Remove changes from stage area (And discard it)

git reset --hard HEAD "path/to/file.html" (Individual file)
git reset --hard HEAD . (All files)

Revert master/branch to specific commit

git reset --hard SHA
[+] More info about reset

Remove local untracked files (Files that are not under version control)

git clean -f path/to/file (individual files)
git clean -df (All files)
[+] More info about clean

Commit changes in stage area

git commit -m "A nice message about your commit"

Modify local commit

git commit --amend (Modify just the message from last local commit)

Add a new file to stage area and include it to last local commit:

1. git add path/to-file.html
2. git commit --amend "A nice new message about your commit"

[+] More info about add
[+] More info about commit

Check what's new in the server before pull

git fetch --dry-run

Pull things to remote repo

git pull
[+] More info about pull

Push things to remote repo

git push
[+] More info about push

See the history of changes

git log
git log --oneline (Show a small version of your log)
git log --graph (Show a graphical representation of commits/branches)
git log --reverse (Show a reverse log)
git log --since=yesterday (Show only commits from yesterday and before)
git log --author "Name of someone" (Show only commits from that person)

You can concatenate parameters:
git log --oneline --reverse --graph
[+] More info about log

See details of a commit

git show (Show last commit, including diff of each file)
git show SHA (Show a specific commit)
git show --stat SHA (Show a commit but instead of show diff, shows only diffstat)
[+] More info about show

See modified files in your local working copy (If there are any)

git diff (Long version)
git diff --stat (Resumed status version)
git diff --name-only (Show only list of diles that have changes)
git diff --staged (Show difference in files that you already added to the stage area (git add))

See your log of your activities in the repo

git reflog (Short version) git reflog --pretty (Detailed version) [+] More info about reflog

See differences in a commit

git diff SHA
[+] More info about diff

Revert changes of a specific commit

git revert SHA (Creating a new commit)
git revert -m SHA (Not creating a new commit. Keep revert files unstaged)
[+] More info about revert

Branches

---

View list of branches

git branch (Only local branches)
git branch --remote or git branch -r (Only remote branches)
git branch --all or git branch -a (Local and remote branches)
[+] More info about branch

Change to a different branch

git checkout name-of-branch (In this case the branch need to exist before checkout)
git checkout -b name-of-new-branch (Create a new branch from the actual and checkout to it)

See differences between branches

git diff branch-name..other-branch-name

Publish branch to remote repository

git push -u origin name-of-branch

Delete a branch

git branch -d name-of-branch (Delete local branch only if it's updated with remote version of it.)
git branch -D name-of-branch (Delete local branch even if you have non pushed changes to remote version of it.)

git push -d origin name-of-branch (Delete remote branch)

Merge branches

To merge a branch you need to checkout to the branch that will receive the merge:

1. git checkout name-of-branch-will-receive-merge
2. git merge name-of-branch-to-be-merged

Rebase

---

Pull things from remote repository and rebase your changes on top of it

git pull --rebase

Rebase master in to branch

You need to be in the branch:
git rebase master
[+] More info about rebase

Rebase one branch in to another

You need to be in the branch that will receive the rebase
git rebase name-of-branch-to-be-rebased

Rebase master in to branch and merge it to master

You need to be in the branch:

1. git rebase master
2. git checkout master
3. git merge name-of-branch

Repository statistics

---

View shortlog of contributors and commits

git shortlog (Show commits description splited by user)
git shortlog -s -n (Show name and number of commits per user ordered by More commits to less commits)
[+] More info about shortlog