makrandp / working-with-git

Working With Git

Working with Git

• Basics
• Basics+

Alias

• Git Aliases Reference 1
• Git Aliases Reference 2
• Git Aliases Reference 3 - Medium Blog
• My ~/.gitconfig

[alias]
	st = status
	pu = config user.email "[e-mail]"
	pu2 = config user.id "makrandp"

Add file to staging

• git add filename

To unstage a file BEFORE COMMIT

• git rm --cached filename (this will remove file after the commit)

To unstage a file AFTER COMMIT

• git reset HEAD -- filename

Checkout remote branch

• git checkout --track origin/branch-name

To discard changes to all files which are tracked and commited

• git checkout -- .

To discard changes to a file which is tracked

• git checkout -- path/to/file

Scenario with Remove/Delete

delete your tracked files

• git rm

If your file is in staging area then you have to give additional force flag.

• git rm -f

delete files from git repository but not from your file system.

• git rm --cached

Git Logs

• git log --oneline
• git log --oneline --graph --decorate --all

you want to see the commit message of a specific author

• git log --author="John Doe"
• git log --pretty=format:"%h%x09%an%x09%ad%x09%s" --author="Mak Patil"

Merge branch

I always merge with --no-ff(no fast forward)

• git merge --no-ff

Git reset

Reset branch to a particular commit

Reset Everything

• Have you ever started working on a branch, making changes, but you change your mind and want to completely start over? Use this command to remove any changes and reset the branch to a clean state.
  • git reset --hard HEAD

Useful commands

• if you have commit hash and you want to see all the code put in for that commit
  • git show 4ce75a333a29f1aafc4817dd8cb128d3e852572f
• if there is a branch which is available remotely but not available locally. to checkout remote branch
  • git checkout -b branchName origin/branchName
• if you merged your feature branch(not pushed the commit to origin) and now decide to undo that recent merge
  • git reset --hard HEAD@{1}
  • https://stackoverflow.com/questions/11722533/rollback-a-git-merge/29110174
  • https://stackoverflow.com/questions/2389361/undo-a-git-merge-that-hasnt-been-pushed-yet