Git Commands

A list of my commonly used Git commands

-->

Configuration

Command	Description
git --version	Check if Git has already been installed
git config --global user.name "YOUR_USERNAME"	To add your username
git config --global user.email "your_email_address@example.com"	To set your email address
git config --global --list	Check your information

Credential caching:

Command	Description
git config credential.helper store	To store credentials only for this project. Run this command before push into repository.
git push origin [branch-name]	Now give the credentials.
git config --global credential.helper 'cache --timeout 7200'	To specify caching expire. 7200 seconds (2 hour).

Getting & Creating Projects

Command	Description
git init	Initialize a local Git repository
git clone ssh://git@github.com/[username]/[repository-name].git	Create a local copy of a remote repository

Basic Snapshotting

Command	Description
git status	Check status
git add [file-name.txt]	Add a file to the staging area
git add -A	Add all new and changed files to the staging area
git commit -m "[commit message]"	Commit changes
git commit -m "first line" -m "second line" -m "third line"	Multiline commit message
git commit -a -m "message"	Git add and commit in one command
git commit --amend -m "updated message"	Rewriting the most recent commit message
git rm -r [file-name.txt]	Remove a file or folder. r for using recursive command. To remove a folder inside another folder git rm -r [parentFolder/childFolder]

Branching & Merging

Command	Description
git branch	List branches (the asterisk denotes the current branch)
git branch -a	List all branches (local and remote)
git branch [branch name]	Create a new branch
git branch -d [branch name]	Delete a branch
git push origin --delete [branchName]	Delete a remote branch
git checkout -b [branch name]	Create a new branch and switch to it
git checkout -b [branch name] origin/[branch name]	Clone a remote branch and switch to it
git checkout [branch name]	Switch to a branch
git checkout -	Switch to the branch last checked out
git checkout -- [file-name.txt]	Discard changes to a file
git merge [branch name]	Merge a branch into the active branch
git merge [source branch] [target branch]	Merge a branch into a target branch
git rebase [branch name]	Moving or combining a sequence of commits to a new base commit
git stash	Stash changes in a dirty working directory
git stash list	View a list of stashed changes
git stash clear	Remove all stashed entries

Situation : Rename a Git branch locally and remotely..

Command	Description
git branch -m [old_name] [new_name]	move locally
git push origin -u [new_name]	-u to set upstream is optional, it configure the new local branch to track the pushed one
git push origin -d [old_name]	delete finally

Merge conflict issue :

Command	Description
git pull/merge origin [branch-name] --allow-unrelated-histories	to merge the disparate branches which is now disabled by default in git but can be enabled with the --allow-unrelated-histories flag. Error look like fatal: refusing to merge unrelated histories
git checkout --ours/--theirs directory_name/*	--ours to Accept Current Change, and for --theirs to Accept Incoming Change. directory_name/* to accept all file in the name of directory(multiple purpose)

Sharing & Updating Projects

Command	Description
git push origin [branch name]	Push a branch to your remote repository
git push -u origin [branch name]	Push changes to remote repository (and remember the branch)
git push	Push changes to remote repository (remembered branch)
git push origin --delete [branch name]	Delete a remote branch
git fetch origin	Only downloads new data from a remote repository
git pull	Downloads and merge all updates into local repository to the newest commit
git pull origin [branch name]	Pull changes from remote repository
git remote -v	List of current Git remotes
git remote update	Will update all of your branches set to track remote ones, but not merge any changes
git remote add origin git@github.com/[username]/[repository-name].git	Add a new remote
git remote set-url origin ssh://git@github.com/[username]/[repository-name].git	Set a repository's origin branch to SSH

Tagging

Command	Description
git tag v1.0.(your version)	Creating a new tag in your local
git push origin v1.0.(your version)	Share the tag remotely
git push --delete origin v1.0.(your version)	Delete remotely
git tag -d v1.0.(your version)	Delete tag in your local
git tag -l	Tag list

Inspection & Comparison

Command	Description
git log	View changes. (type q to exit from git log screen)
git log --summary	View changes (detailed)
git diff [source branch] [target branch]	Preview changes before merging

Generate an SSH key

Command	Describe
ssh-keygen -t rsa -C "mail@gmail.com"	Start with your own gmail account
Enter file in which to save the key (C:\Users\Forhad/.ssh/id_rsa):	Press Enter to leave this empty. Your key will be stored under %USERPROFILE%\.ssh\
Enter passphrase (empty for no passphrase):	Enter your password here
Enter same passphrase again:	And here
Your public key has been saved in C:\Users\Forhad/.ssh/id_rsa.pub.	This is the location of your public key
clip < C:\Users\Forhad/.ssh/id_rsa.pub	Write this command and it will automatically be copied to the clipboard. Now paste the key where you want

To store SSH passphrase

• Go to "Windows PowerShell" and Run it as administrator then write this command → Get-Service ssh-agent
• To check the output of status is not running. Now check that the service has been disabled by running → Get-Service ssh-agent | Select StartType
• Now search "service" to windows start and run as administrator
  • OpenSSH Authentication Agent Properties
  • Startup type: Automatic
  • OK
• Finally write this command and enter passphrase → ssh-add