Git Guide 101

Commit

The "commit" command is used to save your changes to the local repository.

Initialized a repository

1
git init

Add a file to the staging area

1
git add --all

Commit files

1
2
git commit -m "message"
git commit -am "message with adding file to the staging area "

Repository log

1
git log

Repository status

1
git status

Unstag files

1
2
3
4
git reset --hard


git diff <1stVer commit hash> <LastVer commit hash> ::  difference btw changes made

Branch

In Git, branches are a part of your everyday development process. Git branches are effectively a pointer to a snapshot of your changes. When you want to add a new feature or fix a bug—no matter how big or how small—you spawn a new branch to encapsulate your changes. This makes it harder for unstable code to get merged into the main code base, and it gives you the chance to clean up your future's history before merging it into the main branch.

Create a branch

1
2
git branch <branch-name>
git checkout -b <branch-name>

Merge branch

1
git merge <source-branch-name>

List branches

1
2
git branch 
git brach --list

Remove branch

Remotly
1
git push origin --delete <branch-name>
Locally
1
git branch -d <branch-name>

Create a tag

1
git tag <tag-name>

Replace a tag

1
git tag -f <new-tag-name>

List tags

1
2
git tag -l
git tag

Remove tag

1
git tag -d <tag-name>

Fix Common issues

1
git log --oneline

Be carefull!

When you ammend a commit, this will remove the tag from the commit if it has already

Add tag to the latest ammend

1
2
3
git tag
git log --online
git tag -f <update-tag>

Show all changes

1
git reflog

Checkout differert state in the repository

1
git reset HEAD@{5}
Changes sitting there

older version of this file

1
2
3
4
5
6
git reset --hard


or

git reset HEAD@{3} --hard

Reset Back to previous commits.

1
2
git log --oneline
git reset HEAD~2 --hard

Last Commit gone but changes sitting there

1
git reset HEAD~ --soft

Stash -- file no need to put into stage

1
git stash

Take stash file to the stage folder

1
2
3
git stash pop
git add --all
git commit -m "<message>"

Switch between branches A/B B/A

1
git checkout <branch-name>

Add and Push an existing repository

1
git remote add origin <link-to-github-repo>

1
2
git remote add origin https://github.com/mohsinmdl/GTIN-Prediction-System.git
git push -u origin master

List your existing remotes

1
$ git remote -v

Change a remote Git repository

1
git remote set-url origin git@your.git.repo.example.com:user/repository2.git

1
2
3
4
5
6
7
8
You can check the configs of your repository by :

git config -l
which contains your remote repository url.

Also, you can use the following command :

git remote -v

Add submodule to git repo

1
git submodule add https://github.com/mohsinmdl/mohsinmdl.github.io.git site

Update Git submodule to latest commit on origin

1
git submodule update --remote --merge

Remove git from directory

1
rm -rf .git

Error

Git refusing to merge unrelated histories

Error

git pull origin master From https://github.com/mohsinmdl/mdl-portfolio * branch master -> FETCH_HEAD fatal: refusing to merge unrelated histories

Error

There is no tracking information for the current branch. Please specify which branch you want to merge with. See git-pull(1) for details.

solution

1
git pull origin branchname --allow-unrelated-histories

1
git --work-tree="." pull --allow-unrelated-histories

1
git branch --set-upstream-to=origin/master

Save VSCODE Git Credentials

If you wanna save your git password in VSCode, below is the command for that purpose -- 

1
git config --global credential.helper store

Error

git submodule add https://github.com/mohsinmdl/blogs-deploy public 'public' already exists in the index

1
git ls-files

1
git rm --cached <DIR>

1
git rm -f --cached <DIR>

Error

fatal: Please stage your changes to .gitmodules or stash them to proceed

1
git rm --cached .gitmodules

Remove module from .git folder

ls -a cd .git cd modules/ rm -rf mdl-docs/

Git Pull with Submodule

For a repo with submodules, we can pull all submodules using 

1
git submodule update --init --recursive
for the first time. All submodules will be pulled down locally.

To update submodules, we can use 

1
git submodule update --recursive --remote

or simply 

1
git pull --recurse-submodules

Update Git submodule to latest commit on origin

1
git submodule foreach git checkout master

Push all submodules recursively

git1.7.11 ([ANNOUNCE] Git 1.7.11.rc1) mentions:

"git push --recurse-submodules" learned to optionally look into the histories of submodules >bound to the superproject and push them out. So you can use:

1
git push --recurse-submodules=on-demand

Sort branch

1
2
git branch --sort=-committerdate  # DESC
git branch --sort=committerdate  # ASC

How to change my Git username in terminal?

To set your account's default identity globally run below commands 

1
2
3
git config --global user.email "you@example.com"
git config --global user.name "Your Name"
git config --global user.password "your password"

To set the identity only in current repository , remove --global and run below commands in your Project/Repo root directory 

1
2
3
git config user.email "you@example.com"
git config user.name "Your Name"
git config user.password "your password"
Example: 
1
2
email -> organization email Id
name  -> mostly <employee Id> or <FirstName, LastName>

**Note: ** you can check these values in your GitHub profile or Bitbucket profile

You can view all of your settings and where they are coming from using:

1
$ git config --list --show-origin