Ecosyste.ms: Awesome
An open API service indexing awesome lists of open source software.
https://github.com/anshul-sonpure/basic-git-commands
Basic Git Commands and Workflow
https://github.com/anshul-sonpure/basic-git-commands
git git-cheatsheet git-cheatsheets git-commands git-diff git-merge github version-control
Last synced: about 1 month ago
JSON representation
Basic Git Commands and Workflow
- Host: GitHub
- URL: https://github.com/anshul-sonpure/basic-git-commands
- Owner: Anshul-Sonpure
- Created: 2021-12-10T08:31:41.000Z (about 3 years ago)
- Default Branch: main
- Last Pushed: 2022-10-10T11:43:22.000Z (about 2 years ago)
- Last Synced: 2024-04-15T05:32:24.166Z (9 months ago)
- Topics: git, git-cheatsheet, git-cheatsheets, git-commands, git-diff, git-merge, github, version-control
- Homepage:
- Size: 12 MB
- Stars: 1
- Watchers: 2
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
Awesome Lists containing this project
README
A Complete List of curated Git Commands
----
This tutorial will help you get started with Git.
> **Audience of this tutorial are beginners so don't expect advanced concepts.**
Before we start make sure `git --version` command successfully returns. If the output is something like **command not found** then please make sure Git is properly installed on your machine. My machine output is shown below. **Output on your machine might be different.**
```bash
$ git --version
```
```
git version 2.5.4 (Apple Git-61)
```
> **Commands that a user should type on his/her terminal are prefixed with the shell prompt symbol `$`. The output of command follows the command. Also, you don't have to type `$` on your terminal.**
Make sure you have configured your user with Git. This information will be used by Git.
```bash
$ git config --global user.name "Your name"
$ git config --global user.email "Your email"
```
The command shown above populate a file named `.gitconfig` in your user home directory with configuration information.
```bash
$ cat ~/.gitconfig
```
```
[user]
name = Anshul Sonpure
email = [email protected]
[push]
default = simple
```
## Table of Contents
* Why version control system?
* What the heck is Git?
* Git basics
* git init
* git status
* git add
* git commit
* git rm
* git log
* .gitignore files
* git diff
* git diff commits
* Working with branches
* git branch
* git checkout
* git merge
* Working with remote repositories
* git remote
* git pull
* git push
* git clone
* Github basics
* Why and What Pull Requests?
* Advanced topics
* git rebase
* git cherry-pick
* git stash
* git alias
* Using Git from within your IDE(Eclipse)
* Using a Git GUI tool
* Useful Git commands
VCS: Version Control System
----
A version control system is a kind of database for storing your software project source code. It lets you save a snapshot of your complete project at any time you want. When you later take a look at an older snapshot (let's start calling it "version").
You can use version control system to store:
1. Software source code
2. Text files
3. Writing books
4. Sharing datasets
## Why version control system?
You should use version control because:
1. Collaboration
2. Storing Versions
3. Restoring Previous Versions
4. Understanding What Happened
5. Backup
## What the heck is Git?
Git is a distributed version control system. It was developed by Linus Torvalds in 2005 for linux developers.
Every Git working directory is a full-fledged repository with complete history and full version-tracking capabilities, independent of network access or a central server.
Distributed or Decentralized VCS allows many software developers to work on a project without requiring them to share a common network.
## Git basics
Let's start by creating an empty directory `git-playground`. Navigate to a convenient location on your local file system and create a new directory.
```bash
$ mkdir git-playground && cd git-playground
```
### git init
To make any repository a Git managed repository, you will type the following command. These commands should be typed from inside the `git-playground` directory.
```bash
$ git init
```
```
Initialized empty Git repository in ~/git-playground/.git/
```
This will create a directory named `.git` inside the `git-playground` directory.
The `.git` directory structure would look like as shown below.
> **To use `tree` command, you have to install it on your machine. The `tree` command is not required for this tutorial. If you are on mac, then you can use package manager like brew `brew install tree`.**
```bash
$ tree -a .git
```
```
.git
|-- HEAD
|-- config
|-- hooks
| `-- post-commit
|-- objects
| |-- info
| `-- pack
`-- refs
|-- heads
`-- tags
7 directories, 3 files
```
`.git` is a directory where Git stores all the data. **Don't mess up with `.git` directory.** The only file that you should change is `config`.
```bash
$ cat .git/config
```
```
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
ignorecase = true
precomposeunicode = true
```
If you want to override user for this repository then you can add user section by either editing `.git/config` file or using the `git config` command.
```bash
$ git config --local user.name "anshul-sonpure"
```
If you view contents of the `.git/config` file now, then you will see your change.
```bash
$ cat .git/config
```
```
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
ignorecase = true
precomposeunicode = true
[user]
name = anshul-sonpure
```
> **Please revert this change else your commits will be committed using this user name.**
### git status
Time and again we will need to know status of our Git repository. By status it means, what needs to be added to the index, what needs to be committed, is there any change that we have to commit, etc. This is the command that you will use most.
```bash
$ git status
```
```
On branch master
Initial commit
nothing to commit (create/copy files and use "git add" to track)
```
### git add
Let's create a new file `README.md` and add a simple stupid message.
```bash
$ echo "# Git Playground" >> README.md
```
> **It is a good practice to create a file named README.md in your repository root that tells purpose of the repository.**
Now, check the status of the Git repository.
```bash
$ git status
```
```
On branch master
Initial commit
Untracked files:
(use "git add ..." to include in what will be committed)
README.md
nothing added to commit but untracked files present (use "git add" to track)
```
**git add** stage the changes so they are picked by the next commit. In Git, you can't commit something until you make it trackable.
```bash
$ git add README.md
```
Now, check the status of your Git repository.
```bash
$ git status
```
```
On branch master
Initial commit
Changes to be committed:
(use "git rm --cached ..." to unstage)
new file: README.md
```
> **If you have multiple files then you can use `git add .. ` or `git add --all` to stage them in one command.**
### git commit
Once you have a smallest working change, you should commit it to your version control system. Smallest working change could be a test case, a small piece of functional code, a line or paragraph in your text file, etc. **You should commit often and daily.**
After staging your changes, next step is to commit them into your local Git repository. To do that, we will use commit command as shown below.
```bash
$ git commit -m "first commit"
```
```
[master (root-commit) 26afc7f] first commit
1 file changed, 1 insertion(+)
create mode 100644 README.md
```
Staging and committing are two different steps in Git. You can't commit a change until it has been staged. If you are working with a tracked file, then you can do both of these steps in a single command.
```bash
$ echo "This is my Git playground." >> README.md
```
Check the status of your repository. This time it will say it is a modified change.
```bash
$ git status
```
```
On branch master
Changes not staged for commit:
(use "git add ..." to update what will be committed)
(use "git checkout -- ..." to discard changes in working directory)
modified: README.md
no changes added to commit (use "git add" and/or "git commit -a")
```
To stage and commit a change in a tracked file, you can use following command.
```bash
$ git commit -am "second commit"
```
### git rm
Let's suppose we added a bad file to the Git index that we want to remove.
```bash
$ echo "my stupid file" >> stupid.txt
$ git add stupid.txt
```
To remove a bad file from the Git index, we can use Git `rm` command.
```bash
$ git rm -f stupid.txt
```
```
rm 'stupid.txt'
```
### git log
To view history of your commit logs, use the following command.
```bash
$ git log
```
```
commit abae2503d91f6ac2907bd0193ba323e10e73077c
Author: Shekhar Gulati
Date: Thu Jan 14 05:11:19 2016 +0530
second commit
commit bb2b56961e5f2a52e74af316fdb074592b0dbf16
Author: Shekhar Gulati
Date: Thu Jan 14 05:11:06 2016 +0530
first commit
```
If you want to see a commit in one line, then use `oneline` option.
```bash
$ git log --oneline
```
To make it look a bit better
```bash
$ git log --oneline --decorate
```
Searching through logs
```bash
$ git log --oneline --grep "first"
```
Searching by author
```bash
$ git log --oneline --decorate --author Shekhar
```
You can format the way you want by using a formatter. Learn more about formatter from here [https://git-scm.com/docs/pretty-formats](https://git-scm.com/docs/pretty-formats)
```bash
$ git log --pretty=format:"%h %aN %ar" --date=short
```
There are many more options. You can refer to help `git help log` for more details.
### .gitignore files
Every Git repository should have another configuration file `.gitignore` present in the root i.e. directly inside the `git-playground` directory. This file is used to specify files and file patterns that you want to ignore.
```bash
$ echo "*.log" >> .gitignore
$ echo "target/" >> .gitignore
$ echo "dummy.txt" >> .gitignore
```
1. The first pattern says any file with extension `log` will ignored.
2. The second pattern says directory with name `target` will be ignored.
3. The third pattern means file with name `dummy.txt` will be ignored.
Now add and commit the `.gitignore` to your Git repository.
```bash
$ git add .gitignore
$ git commit -m "third commit. Adding .gitignore file"
```
### git diff
To view unstaged changes since last commit.
```bash
$ echo "I will learn Git today." >> README.md
```
```bash
$ git diff
```
```bash
diff --git a/README.md b/README.md
index 6b8025a..fcb7db5 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,3 @@
# Git Playground
This is my Git playground.
+I will learn Git today.
```
Let's commit the change.
```bash
$ git commit -am "fourth commit"
```
Now, if you execute `git diff` command, you will see nothing.
### git diff commits
To compare head with the previous commit you can use the following command.
```bash
$ git diff HEAD~1..HEAD
```
You can also use commit ids.
```bash
$ git diff
```
### git clean
`git clean` command helps us to remove untracked files and directories from the working tree.
```bash
$ touch abc.txt
$ mkdir tmp
$ touch tmp/def.txt
```
Forcefully remove untracked files
```bash
$ git clean -f
```
Forcefully remove directory
```bash
git clean -d
```
Forcefully remove untracked file and directory
```bash
$ git clean -df
```
To also remove files in the `.gitignore` file, you can specify `-x` option.
```bash
$ echo "logging" >> abc.log
```
`git clean` will not do anything
```bash
$ git clean -f
```
```bash
$ → ll
total 16
-rw-r--r-- 1 shekhargulati staff 83B Jan 14 05:59 README.md
-rw-r--r-- 1 shekhargulati staff 8B Jan 14 06:30 abc.log
```
You can clean up `.gitignore` files using the `-x` option.
```bash
$ git clean -f -x
Removing abc.log
```
## Working with branches
A branch represents an independent line of development. You use branch for following:
1. Develop a new feature. Once you are done with the feature it will be merged into your main branch.
2. Fix a bug.
3. Your experiment playground.
By default, every git repository has one branch called **master**. When you create a new branch, you get a new development workspace. Any change that you make to the new working directory has no impact on your previous working directory.
### git branch
**git branch** command lets you work with Git branches.
To view all the branches, you execute following command.
```bash
$ git branch
* master
```
> **branch marked with a * is the current branch.**
Let's suppose we have to implement some new functionality. To work on new functionality, we create a new branch called `feature1`.
```bash
$ git branch feature1
```
You can view branch list again.
```
$ git branch
feature1
* master
```
One thing that is important to understand here is Git branches are just pointers to commits. When you create a branch, all Git needs to do is create a new pointer—it doesn’t change the repository in any other way.
```bash
$ git log --oneline --decorate
```
```
79a81e4 (HEAD -> master, feature1) fourth commit
c9a8f2d third commit. Added .gitignore file
abae250 second commit
bb2b569 first commit
```
### git checkout
To switch to a branch, you use checkout command.
```bash
$ git checkout feature1
```
The `git checkout` command lets you navigate between the branches created by git branch.
To create a new branch and checkout it in one command
```bash
$ git checkout -b feature1
```
Let's add our new feature now.
```bash
$ echo "I will read a Git tutorial today to make sure I understand Git thoroughly." >> README.md
```
Commit it to the `feature1` branch.
```bash
$ git commit -am "fifth commit. Read tutorial"
```
### git merge (ff)
Once we are done with our feature, we can merge it back to master.
```bash
$ git checkout master
```
**git merge** command allows you to merge an independent development line created by `git branch` into a single branch.
> git merge will merge into the current branch.
To merge `feature1` branch into `master` branch, execute the following command.
```bash
$ git merge feature1
```
```bash
$ git log --oneline --decorate
```
```
5ce434c (HEAD -> master, feature1) fifth commit. Read tutorial
79a81e4 fourth commit
c9a8f2d third commit. Added .gitignore file
abae250 second commit
bb2b569 first commit
```
> the default merge algorithm is ff i.e fast forward. When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit. This is the default behavior.
A **fast-forward** merge can occur when there is a linear path from the current branch tip to the target branch.
Now that we are done with `feature1` branch, let's delete it.
```bash
$ git branch -d feature1
```
### git merge (--no-ff)
Create another new branch `feature2` and add a new commit.
```bash
$ git checkout -b feature2
$ echo "I will watch a Git video by Linus Torvalds https://www.youtube.com/watch?v=4XpnKHJAok8" >> README.md
$ git commit -am "sixth commit. Watch video."
```
Now checkout master again.
```bash
$ git checkout master
```
The `--no-ff` algorithm always generate a merge commit (even if it was a fast-forward merge)
```bash
$ git merge --no-ff feature2
```
View logs of master
```bash
$ git log --oneline --decorate
```
```
0039442 (HEAD -> master) Merge branch 'feature2'
904ab35 (feature2) sixth commit. Watch video.
5ce434c fifth commit. Read tutorial
79a81e4 fourth commit
c9a8f2d third commit. Added .gitignore file
abae250 second commit
bb2b569 first commit
```
The interesting bit is that it created a merge commit. Git uses Three-way merge algorithm.
1. the `MERGE_HEAD` commit i.e. the modification that we want to merge
2. the `HEAD` commit i.e. the branch in which the `MERGE_HEAD` will be merged i.e. the branch on which the git merge command is called
3. the `ORIG_HEAD` commit i.e. the best common ancestor of `MERGE_HEAD` and `HEAD` that will serve as the reference.
Delete the feature branch `feature2`
```bash
$ git branch -d feature2
```
### git merge (commits in both master and branch)
Create another new branch `feature2` and add a new commit.
```bash
$ git checkout -b feature3
$ echo "I will try Git using tutorial https://try.github.io/" >> README.md
$ git commit -am "seventh commit. Try Git."
```
Checkout master branch and edit an existing line.
```bash
$ git checkout master
```
Change **I will read a Git tutorial today to make sure I understand Git thoroughly.** to **I will read a Git tutorial https://www.atlassian.com/git/tutorials/.**
```bash
$ cat README.md
```
```
# Git Playground
This is my Git playground.
I will learn Git today during the XKE.
I will read a Git tutorial https://www.atlassian.com/git/tutorials/.
I will watch a Git video by Linus Torvalds https://www.youtube.com/watch?v=4XpnKHJAok8
```
Now, commit the change to master branch.
```bash
$ git commit -am "fixed Git tutorial bullet point"
```
Now merge the `feature3` branch. This will create a merge commit.
```bash
$ git merge feature3
```
View the log graph.
```bash
$ git log --oneline --graph
```
```
* b182cc7 Merge branch 'feature3'
|\
| * 6f04457 seventh commit. Try Git.
* | fd759a7 fixed Git tutorial bullet point
|/
* 0039442 Merge branch 'feature2'
|\
| * 904ab35 sixth commit. Watch video.
|/
* 5ce434c fifth commit. Read tutorial
* 79a81e4 fourth commit
* c9a8f2d third commit. Added .gitignore file
* abae250 second commit
* bb2b569 first commit
```
### git merge (conflict)
In this section, we will look at scenario where there is a merge conflict. Merge conflict happens when you‘re trying to merge a branch that has changed the same part of the same file as master. Let's create a new branch `feature4`, make a change, and commit.
```bash
$ git checkout -b feature4
$ echo "I will create a Github account today." >> README.md
$ git commit -am "eighth commit. Signup for Github."
```
Now, checkout master, make a change, and then commit it.
```bash
$ git checkout master
$ echo "I will create my first repository today." >> README.md
$ git commit -am "eighth commit. Create repository on Github."
```
If you try to merge the `feature4` branch, you will get merge conflict as shown below.
```bash
$ git merge feature4
```
```
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Automatic merge failed; fix conflicts and then commit the result.
```
To merge the conflict, open the file in your favorite editor. I like Atom.
```bash
$ cat README.md
```
```
# Git Playground
This is my Git playground.
I will learn Git today during the XKE.
I will read a Git tutorial https://www.atlassian.com/git/tutorials/.
I will watch a Git video by Linus Torvalds https://www.youtube.com/watch?v=4XpnKHJAok8
I will try Git using tutorial https://try.github.io/
<<<<<<< HEAD
I will create my first repository today.
=======
I will create a Github account today.
>>>>>>> feature4
```
The merged output is shown below.
```
# Git Playground
This is my Git playground.
I will learn Git today during the XKE.
I will read a Git tutorial https://www.atlassian.com/git/tutorials/.
I will watch a Git video by Linus Torvalds https://www.youtube.com/watch?v=4XpnKHJAok8
I will try Git using tutorial https://try.github.io/
I will create a Github account today.
I will create my first repository today.
```
To make the merge resolved, execute `git add` command.
```bash
$ git add README.md
```
Commit it
```bash
$ git commit -am "Resolved merged conflict with feature4 branch"
```
Output of `git log` command is shown below as well.
```bash
$ git log --oneline --decorate --graph
```
```
* 4da527c (HEAD -> master) Resolved merged conflict with feature4 branch
|\
| * 84ee6f1 (feature4) eighth commit. Signup for Github.
* | 0af5877 eighth commit. Create repository on Github.
|/
* b182cc7 Merge branch 'feature3'
|\
| * 6f04457 seventh commit. Try Git.
* | fd759a7 fixed Git tutorial bullet point
|/
* 0039442 Merge branch 'feature2'
|\
| * 904ab35 sixth commit. Watch video.
|/
* 5ce434c fifth commit. Read tutorial
* 79a81e4 fourth commit
* c9a8f2d third commit. Added .gitignore file
* abae250 second commit
* bb2b569 first commit
```
## Working with remote repositories
In Git, every developer has their own local copy of the repository. It has all the repository history and branches. A developer works on his local copy and when she is done with her work, she pushes her changes to a remote repository. A local repository can point to 0 or n remote repository. A remote repository could be on Github or any other cloud VCS provider or even it could be on your own machine.
Let's start by creating a bare repository. Navigate to any convenient location on your filesystem and run the following command.
```bash
$ git init --bare git-playground-remote.git
```
This will create a directory `git-playground-remote.git` on your filesystem.
### git remote
The **git remote** command lets you create, view, and delete connections to other repositories.
To view all the remotes, execute the following command.
```bash
$ git remote
```
As we have not added any remote yet so command will not print any output.
To add a new remote, execute the following command.
```bash
$ git remote add local ../git-playground-remote.git
```
> **Please use correct path to your remote repository.**
To push our repository changes to this remote repository we can run the following command. This command will be executed from inside the `git-playground` directory.
```bash
$ git push local master
```
```
Counting objects: 37, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (32/32), done.
Writing objects: 100% (37/37), 3.41 KiB | 0 bytes/s, done.
Total 37 (delta 11), reused 0 (delta 0)
To ../git-playground-remote.git
* [new branch] master -> master
```
Now, you can create multiple local copies of the remote repository using `clone` command.
```bash
$ git clone git-playground-remote.git git-playground-1
```
```
Cloning into 'git-playground-1'...
done.
```
Change directory and view the contents.
```bash
$ cd git-playground-1
```
You can see history of the repository using `git log --oneline --decorate` command.
Let's make a change in `git-playground-1` repository.
```bash
$ echo "I will read Git in Practice book" >> README.md
$ git commit -am "ninth commit. Read book."
$ git push local master
```
To get changes in our first repository i.e. `git-playground`, you will use `pull` command.
```bash
$ git pull local master
```
```
remote: Counting objects: 3, done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3 (delta 1), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From ../git-playground-remote
* branch master -> FETCH_HEAD
4da527c..b38de01 master -> local/master
Updating 4da527c..b38de01
Fast-forward
README.md | 1 +
1 file changed, 1 insertion(+)
```
## Github basics
Github is a collaborative code management platform for open source and private projects. It has social features just like any other social website like Facebook, Twitter, etc.
You use Github to store your code on a remote Git repository. You will use Github for following reasons:
1. Storing your data in a cloud solution which will make sure code is backed up and available 24X7.
2. Collaborative code reviews
3. Easily manage teams within organizations.
4. Syntax highlighted code & rendered data
Read more on Github [https://github.com/features](https://github.com/features).
You can sign up for Github at [https://github.com/join](https://github.com/join).
There are alternatives to Github like Bitbucket but Github is the leader.
### Setup SSH keys
If you don't already have setup SSH keys then you should refer to https://help.github.com/articles/generating-ssh-keys/
### Create a repository
Create a new repository by clicking [https://github.com/new](https://github.com/new).
Give it name `git-playground` and choose defaults.
### add remote
From inside your `git-playground`, execute the following command.
```bash
$ git remote add origin [email protected]:shekhargulati/git-playground.git
```
### git push
Push the changes to Github.
### Create pull request
Fork the repository [https://github.com/shekhargulati/git-the-missing-tutorial](https://github.com/shekhargulati/git-the-missing-tutorial). Forking repository give you your own copy of the repository.
1. Clone your clone on your local machine.
2. Write a message in the `testimonials.md`
3. Commit and push the changes to your fork
4. Create a pull request
## Advanced topics
This section will talk about some of the advanced concepts that might be useful.
### git rebase
Rebasing is the process of moving a branch to a new base commit. It is used to keep Git history linear so you will not have merge commits.
```bash
$ git checkout -b feature5
$ echo "I will prefer rebase over merge to avoid merge commit." >> README.md
$ git commit -am "tenth commit. Prefer rebase over merge"
```
Work on master branch.
```bash
$ git checkout master
$ echo "I will prefer merge over rebase as it is easy to understand." >> README.md
$ git commit -am "tenth commit. Merge over Rebase"
```
Rebase command
```bash
$ git rebase feature5 master
```
Fix merge conflicts.
```bash
$ git add README.md
$ git rebase --continue
```
Now view the logs using
```bash
$ git log --oneline --decorate --graph
```
Delete the branch
```bash
$ git branch -d feature5
```
### git cherry-pick
Applying a commit from one branch to another
### git stash
Temporarily save your current state without creating a commit.
1. Make a change to README.md
2. Run `git stash` command
3. List all stashes `git stash list`
4. Apply the stash using `git stash apply` or `git stash pop`
### git alias
Allows you write your own commands or shortcuts. Like we have been using `git log --oneline --decorate --graph`.
```bash
$ git config --global alias.mylog "log --oneline --decorate --graph"
```
## Using Git from within your IDE(Eclipse)
TODO
## Git Gui
I mostly use command-line terminal. For Mac, I find gitx useful [http://gitx.frim.nl/](http://gitx.frim.nl/)
## Useful Git Commands
1. Most useful 20 git commands `git help everyday`
2. To view help of any git command `git help ` for example `git help commit`
3. To refer to all the Git terms `git help glossary`
4. Overwrite your changes with the changes in the remote `git fetch --all && git reset --hard origin/master`
5. Viewing unstaged changes since last commit `git diff`
6. List all branches that are already merged into master `git branch --merged`
7. List all branches and their upstreams, as well as last commit on branch `git branch -vv`
8. Deleting a branch `git branch -d `
9. Delete a remote branch `git push origin --delete `
10. Undo local changes with last content in head `git checkout -- .` or `git checkout -- `
11. Revert last commit `git revert HEAD` or `git revert HEAD~n` or `git revert `. This creates a new commit with undo
12. Reset: Discard last commit. Last commit content is lost. `git reset --hard HEAD` or `git reset --hard HEAD~n`
13. Reset: Discard last commit. Last commit is unstaged. `git reset --soft HEAD` or `git reset --soft HEAD~n`
14. List all remotes `git remote`
15. List all local and remote branches `git branch -a`
16. See all commits made since forking from master `git log --no-merges --stat --reverse master..`
17. Saving current state of tracked files without committing `git stash`
18. Show list of all saved stashes `git stash list`
19. Apply last stashed state and delete it from stashed list `git stash pop`
20. Forcefully remove untracked files `git clean -f`
21. Forcefully remove untracked directory `git clean -d`
22. Forcefully remove untracked file and directory `git clean -df`
23. Rename a branch `git branch -m `
24. Always rebase instead of merge on pull `git config --global branch.autosetuprebase always`