• Basic Git Commands

  • Configuration

    Sr. No.	Command	Description
    1	git config --global user.name "Ankit Patel"	Configure username used with commit
    2	git config --global user.email "ankitpansuriya007@gmail.com"	configure email address to be used with commits
    3	git config user.name "username"	configure username to be used with commits in particular(single) repo
    4	git config user.email "somemail@domain.com"	configure email address to be used with commits in particular(single) repo
    5	git config color.ui	colorfil git output
    6	git config format.pretty oneline	show log on just one line per commit
    7	git add -i	interactive adding
    8	git config credential.helper store	Store credentials (email and password) in local repo

  • Repository

    Sr. No.	Command	Description
    1	git init	create a new local repository
    2	git clone /path/to/repository	create a working copy of a local repository
    3	git clone username@host:/path/to/repository	create working copy of remote repository
    4	git clone https://github.com/:username/:repo-name.git	(Alternative solution) create working copy of remote repository
    5	git remote add origin [server]	to connect local repository to remote repository to push on server
    6	git remove -v	List all currently configured remore repositories
    6	git remote remove origin	remove origin from the repository
    7	git push origin master	send changes to the master branch of your remore repository
    8	git status	List the files you've changed and those you still need to add or commit
    9	git checkout -b [branchName]	create a new branch and switch to it
    10	git checkout [branchName]	switch from one branch to another
    11	git branch	List all the branches in your repo
    12	git branch -d [branchName]	delete branch from local repository
    13	git push --all origin	push all branches to your remote repository
    14	git push origin :[branchName] or git push origin --delete [branchName]	delete a branch on your remote repository
    15	git pull	fetch and merge changes on the remote server to your working directory
    16	git merge [brnachName]	to merge different branch into active branch
    17	git diff	view all the merge conflicts
    18	git diff --base [fileName]	view the conflicts against the base file
    19	git diff [sourceBranch] [targetBranch]	Preview changes before merging
    20	git fetch origin	fetch the latest history from the remote and point your local brach at it (will keep local changes as it is)
    21	git reset --hard origin/[branchName]	discard local changes and make local brnach same as remote repository
    22	git clean -fd	delete untracked files

• Files

  Sr. No.	Command	Description
  1	git add [fileName] or git add -A or git add *	add one or multiple file to stage area
  2	git commit -m "commit message"	commit changes to head
  3	git commit -a	commit any files you have added with git add and also commit any files you have changed since then
  4	git checkout -- [fileName]	If you mess us, you can replace the changes in your working tree with the last content in head (Changes added to the index, as well as new files, will be kept)
  5	git reset -- [files]	unstage files, from stage to local area or undo git add command

• Tags

  Sr. No.	Command	Description
  1	git tag 1.0.0 [commitId]	tagging to mark a significant changeset/release
  2	git push --tags origin	push all tags to remote repository

• Logs

  Sr. No.	Command	Description
  1	git log	list of commits in active branch with unique commitIds
  2	git log --pretty=oneline	display compressed log where each commit is one line
  3	git log --author=ankit patel	display commits of certain user
  4	git log --graph --oneline --decorate --all	ASCII art tree of all the branches with details
  5	git log --name-status	display only files have changed

---

• Next - 1

  • Stash

    Sr. No.	Command	Description
    1	git stash	Temporarily stores all modified tracked files
    2	git stash list	list all stashed changesets
    3	git stash pop	restore the most recently stashed files
    4	git stash apply	Restore stashed changes
    5	git stash drop	Discards the most recently stashed changesets

  • Sync local repo with remote

    Sr. No.	Command	Description
    1	git remote prune origin	It will remove branches which are not in use
    2	git fetch	It will fetch new remote branches
    3	git fetch --prune	Combined command of steps 1 & 2 in above

  • git merge v/s git rebase

    git merge	git rebase
    git merge [sourceBranch] [targetBranch]	git checkout [sourceBranch] & git rebase [targetBranch]
    Create New merge commit in the target branch that ties to gather the history of both branches	Moves history of source branch to the tip of the target branch
    hard to read history	much cleaner history

  • create patch from commit history

    Sr. No.	Command	Description
    1	git commit -m "commit to create diff"	added new commit for which we want to create patch
    2	git log	compare the history
    3	git diff *PreviousCommit* *diffCommit* > myfile.diff	It will create myfile.diff in active directory and contains comparative changes with previous history
    4	git apply myfile.diff	It will display changes as modified files

• Other useful git commands

  Sr. No.	Command	Description
  1	gitk	opens git GUI
  2	git commit -c --reset-author	This would change the committer to you, best to use after a conflicting cherry-pick
  3	git commit --amend	changes made will be included in last commit. need to force push after that
  4	git push [remote] [branch] --prune	this would remove the remote branches with no local counterPart
  5	git push [remote] [branch] --dry-run	The update won't be sent but all the other process would be done
  6	git fetch [remote] [branch] --dry-run	show what would be done without actually doing it
  7	git merge --abort	This will abort the current conflict resolution process, and try to reconstruct the pre-merge state, but the uncommitted or unstashed ones might not be reconstructed