The document provides an overview of common Git commands organized into categories like init/clone, add/commit, branch, log, diff/blame, undo/revert, merge/rebase, remote operations and more. It also includes explanations of concepts like the three main areas in Git (working directory, staging area, HEAD), and tips like using fetch instead of pull and following a forking workflow. The document is intended to teach attendees the essentials of using Git through explaining commands and best practices.

1. LetsVenture
Making fundraising easy

2. Event: Share & Learn
Subject: Next Level Git
Date: Feb 2020
By: PARAG GUPTA
Team: MSE
© guptaparag1996@gmail.com

3. Common Git Commands
init, remote, clone, config
add, commit, notes, remote, push,
pull, fetch
branch, checkout, tag, describe,
merge,switch
log, shortlog,whatchanged, reflog,
status, stash, diff, blame, ls-files,
archive
reset, rebase, rm, mv, restore,
clean,tag, show, cherry-pick,revert,
squash

4. git ?, why git, repository,
Clone & fork

5. git status:
Untracked Files
Modified
Staged Files
Working tree = Untracked +
Modified
Commited:unmodified/loc
ally stored
Gitignored = Before
Untracked
There are 3 major concepts of places:
● Working Directory → files in your working directory.
● Staging Area (aka cache, index) → a temp area that git add is placed into.
● HEAD → A reference to a specific commit (think of it as a variable). Normally, it
points to the last commit in local repository. (that is, after you did git commit).

7. 1. git init //Create local folder
2. git add <directory> , git add <file>,
git add . , git add --all or git add -A
// move file to staging area from WD

8. Config
git config credential.helper store or // you will be prompted to enter your
credentials
git config --global credential.helper "cache --timeout 7200"
//to enable credential caching
git config --global --unset credential.helper //unset credentials
git config –global user.name “[name]”
git config –global user.email “[email address]”
git config --list
git config --global alias.co checkout
git ls-files

9. git commit -a -m “add .and commit together”
git commit --amend -m "Add the remaining tracked file"
git notes add -m “my note on commit” //git notes list
git remote add origin https://........
git remote (-v)
git remote remove origin
git remote set-url origin git://new.url.here
git remote rename origin old-origin
git push (-u) <remote-name><branch> (--all, --tag)

10. Undo Stage Changesgit reset [<mode>] [<commit>]
//unstage,without removing the changes
//resets the current branch head to <commit>
git reset HEAD^^^
git reset --soft HEAD~10 && git commit -m "squashed last 10 commit"
git clean -f // delete untracked files from harddisk, -n(dry run)
git clean -fd //-f -d empty folder
git rm --cached my-file.js
git rm <file> // delete from harddisk too
git mv file_oldname.txt file_newname.txt

11. Undo Commit
git checkout -- <file> //discard changes
git checkout -- '*.c' //all .c files
git checkout -f // discard changes of all not commited files
git checkout 8a7b201 index.html //restore old version
git checkout HEAD~5 // uncommit last 5 commit
git checkout master~5 Makefile //
git checkout HEAD about.html imprint.html //restore last commit
git reset HEAD -- <file>

12. Undo Commit
git checkout @{yesterday}
git checkout @{2.days.ago}
git checkout @{'2 days ago'}
git checkout @{'5 minutes ago'}
git checkout @{'1 month 2 weeks 3 days 1 hour 1 second ago'}
git checkout any-branch-name@{'1 hour ago'}
You are in 'detached HEAD' state.

13. Bad commit
Undo and Revert
an Older Commit
git revert 2b504bee
git revert --no-commit HEAD~3..
This command reverts last 3 commits with only one commit.
A very elegant and low-risk way of undoing something!

16. B
R
A
N
C
H
git branch //our current branches
git show-branch --list
git branch -a // + remote branch (-r)
git branch dev_branch // create new branch
git checkout dev_branch //switch into dev_branch // dev_branch may be remote branch
git checkout - // co to previous active branch //- is the branch name. - is a alias of "@{-
1}"
git checkout -b admin-panel //create new branch +switch into admin-panel
git checkout -b <branchname> --track upstream/<branch name>
git branch -d dev_branch //delete the dev_branch
git branch -D dev_branch //delete the dev_branch
git fetch origin //fetch the remote branches

17. Branch, Tag
If you want to rename a branch while pointed to any branch, do:
git branch -m <oldname> <newname>
If you want to rename the current branch, you can do:
git branch -m <newname>
To set a git branch alias, execute the following:
# alias -> real branch
git symbolic-ref refs/heads/trunk refs/heads/master
With the alias in place, you can execute commands like:
git checkout trunk

18. Log
n, p, s,
grep “MSE”,author “PDG”,
summary, branches, oneline,
stat, shortstat,
since=”1 Feb, 2020”, after=”2 weeks ago”, before=”1 year ago”, until,
merges, no-merges,
format=“%an”, pretty=format:”custom format: %cn committed %h on %cd”

19. git log — foo.py bar.py
git log master..feature [all f commit not in m]
git shortlog -snec --no-merges
git whatchanged #Show logs with difference each commit introduces
git log --pretty=format:"%cn committed %h on %cd"

20. Diff, Blame, Archive
git diff
git diff --staged/--cached
git diff [source branch] [target branch}
git blame -- src/client/Managers/FilterData.js
git archive --output=./example_repo_archive.tar.gz --format=tar HEAD ./build
--remote=<repo>

21. Stash
$ git checkout B
# do some change here
$ git add .
$ git stash save 'stash of B' // or git stash only
$ git checkout A
# do some change here
$ git add .
$ git stash save 'stash of A'
$ git checkout B
$ git stash list # see the stash list with message
stash@{0}: WIP on {branch_name}: {SHA-1 of last commit} {last commit of you branch}
$ git stash apply stash@{1} # B's stash will be applied
$ git stash drop stash@{1} # remove B's stash from stash stack
git stash -p # choose which file to be stashed
git stash clean # remove/delete all stash
git stash apply # for apply your last changes from stash list
git stash apply #default to stash@{0} Latest Stash.
git stash apply stash@{12} # if you will have many stashes you can choose what stash will apply
git stash drop stash@{0} # for remove from stash list
git stash pop stash@{1} # for apply choosed stash and drop it from stash list
git stash clear #Remove all the stashed states.

22. merge git merge dev_branch
//merging another branch into the current
git checkout master
git merge --squash bugfix
git commit
git merge --abort

23. Rebase feature> git rebase master //Automated
The major benefit of rebasing is that you get
a much cleaner project history. First, it
eliminates the unnecessary merge commits
required by git merge. Second, as you can
see in the diagram, rebasing also results in
a perfectly linear project history
git merge-base feature master
The following returns the commit ID of the
original base, which you can then pass to git
rebase:
git rebase -i <commit> //Interactive
rebasing
By default, the git pull command performs a
merge, but you can force it to integrate the
remote branch with a rebase by passing it
the --rebase option.
● git merge: It is safe and we often do not worry about losing code
● git rebase: could be dangerous if being used carelessly.

24. Pull, Fetch and Push git pull = git fetch + git merge
update your local code with
changes from origin repos.
Note that the "push" command can
also be used to delete a remote
branch.
git push origin --delete feature

25. Good Practices:
Follow Forking Workflow: fork then clone.
Start a "git pull" only with a clean working copy
Never Amend Published Commits

26. Hey You, Yes You, You Know ?
Q: What is the .gitkeep file?
Q: What’s git cherry-pick? Cherry Pick A Range Of Commits

27. Operations
-f fetch
-b branch
-t --track

28. That's it, folks!
I hope you have enjoyed
this Git session and
learned the commands
and A few git tips you
didn't know!
Thank You :)
© guptaparag1996@gmail.com