Git and GitHub Commands Mastery

1. Setup Git and GitHub Global Configuration 

git config --global user.email "gautamthakur1983@gmail.com"

git config --global user.name "Gautam Thakur"

git config --global list

git config --list

2. Git Lifecycle | Initilize, Status, Add, Commit

git status

git init

git add

git commit -m "Commit Message"

git log

git log --oneline

3. Git Difference between last commit changes and current version changes

git diff

4. Git Compare between 2 different Git Commits

git diff eac4c5b 82485b1

5. Git Statsh - To save some changes for temporary purpose ## Pop take out stash and clear but apply take out stash but not clear

git stash

(To save current changes for temporary)

git stash pop

(To take out all stash contents)

git stash list

git stash clear

(To clear all the stash changes)

git stash save "NAME" 

git stash save "NAME1"

(Working with multiple stash)

git stash sapply 0 or 1

(0 for name, 1 for about) after that run git stash clear

git stash clear

6. Git Restore - It help us to restore previous state/commit or remove the changes we did

git restore FILENAME

(Restore all the changes in the working directory) It work for the individual file.

git restore --staged FILENAME

(Restore all changes from staging area)

7. Git Branch - Creating, Deletion, Merging etc.

List all the branches

git branch

Create a new branch

git branch <NEW_BRANCH_NAME>

Change the Branch

git checkout <BRANCH_YOU_WANT_TO_USE>

First checkout to main then merge with main

git merge <UPDATED_BRANCH>

Delete the new branch locally once you done with that

git branch -d <BRANCH_YOU_WANT_TO_DELETE>

Delete the feature branch remotely on GitHub

git push origin --delete <BRANCH_YOU_WANT_TO_DELETE>

8. Git Pull - Pull all the changes from the remote repository

To pull the changes from remote repository

git push origin main

git config pull.ff false

Note: In Case of Merge Error While Pulling: [Click Here](https://stackoverflow.com/questions/62653114/how-can-i-deal-with-this-git-warning-pulling-without-specifying-how-to-reconci)

9. Git Merge Conflict

Accept Current Changes | Incoming Change | Both the changes

10. Git Express commit 

(Only work if file is already staged once. It will not work for new file inside working area)

git commit -a -m "COMMIT MESSAGE"

or

git commit -am "COMMIT MESSAGE"

11. Git - Create new branch and checkout at the same time

git checkout -b <NEW_BRANCH_NAME>

12. Git - Check all latest commit in all the branches

git branch -v

13. Git Information about all the remote branches

git branch -r

14. Git - Check all the connected Remote Repository

git branch -v

15. Git - To check all the Merged and not Merged branches

git branch --merged

git branch --no-merged

16. Git - Delete the branch which is not merged with main

git branch -D <BRANCH_NAME)

17. Git - Rebase | Rebase and Merge are use to integrate changes.

Merge all the changes from feature to main, them rebase main to feature

git rebase feature

git rebase main

18. Git Rebase vs Git Merge

• Merge - Git merge keep history of everything. Have idea about conflicts##
• Rebase - Order of change not preserve in git rebase. No idea about merge conflict. After Rebase all the changes always added at the top. In spite of other commits in between. After Rebase, history on commit will be same with other branch.

19. .gitignore

.gitignore file is to ignore files from the current code which you did not want git to track. Like environment variable, password, any critical data and unwanted files and folders.

.env
/directory

20. Git Squash - Merge multiple commit into one single commit

git rebase -i HEAD~9

21. Git Revert - To Revert changes of any commit, all the change of that commit will be removed

git revert 1513040

22. Git Reset - Soft, Mixed and Hard

Soft Reset

git reset --soft HEAD~

Soft Reset will remove your Git commit and add your latest chnage to the staging area with loosing any data.

Mixed Reset

git reset

By default when you didn't specify any flag it's a mixed reset. It move your changes from staging area to working area without changing any data.

Hard Reset

git reset --hard HEAD~

 Hard reset will remove commit as well as your data.

23. Git Tag - Better for history

For create a git tag

git tag v0.1

Push tag to remote repository

git push origin v0.1

git tag list will show all the tags

git tags list | git tag --list

Note: We can RELEASE with tag what all the changes has been done as compare to previous tag.

git tag with name and commit message

git tag -a [tag_name] [commit_SHA] -m "commit message"

Jump to previous tag or any tag (for testing)

git checkout v0.1

Note: Do it new brach if you checkout previous tag or commit and your start commit from that commit then it will create a new timeline and thungs will messay for you so back to the latest commit in the branch run the command.

In case of Branch  detach

git checkout main

Jump to previous any commit (for testing)

git checkout [commit_SHA]

 

Delete a git tag

git tag -d [tag_name]

Delete tag from GitHub remote repository

git push origin --delete [tag_name]

24. Git Clone - Clone a GitHub Repository

git clone https://github.com/Gautam29683/git-github-mastery.git

Let's assume we have clone the code from someoneelse Repository and want to use with own repository

git remote rm upstream

25. GitHub README Profile and Project Useful Resource:

1. https://emojipedia.org/   - For Emogies
2. https://simpleicons.org/  - For Icons Packs
3. https://shields.io/.           - For Badges
4. https://readme.so/.         - For Project README