- ✔️ Better teamwork
- ✔️ Control of changes in the project
- ✔️ Audit and reliability
- ✔️ Return to previous versions
- ✔️ Local & Remotes Repositories
- ▪️▪️▪️ And much more
With platform specific installers for Git, GitHub also provides the ease of staying up-to-date with the latest releases of the command line tool while providing a graphical user interface for day-to-day interaction, review, and repository synchronization.
htps://windows.github.com
htps://mac.github.com
For Linux and Solaris platforms, the latest release is available on the official Git web site.
htp://git-scm.com
git --version
Configuring user information used across all local repositories
git config --global user.name “[firstname lastname]”
set a name that is identifiable for credit when review version history
git config --global user.email “[valid-email]”
set an email address that will be associated with each history marker
git config --global color.ui auto
set automatic command line coloring for Git for easy reviewing
Configuring user information, initializing and cloning repositories
git init
initialize an existing directory as a Git repository
git clone [url]
retrieve an entire repository from a hosted location via URL
# navigated into your folder you want to put on Github
$ touch README.md # create a file called README.md where you can put instructions/info about your folder like what you are reading right now!
$ git init # initialize your git repository locally
$ git add . # adds everything changed from local to staging
$ git commit -m "first commit" # commits everything in staging to be ready to be pushed to Github
$ git remote add origin https://github.com/.....
$ git push -u origin master # the "-u" is so that the next time your push you don't need to type "origin master"
# put in username & password
$ git add .
$ git add -u # when you have deleted a local file you want to remove from your repository
$ git commit -m 'what has changed'
$ git push
# put in username & password
# Note that you must first generate a SSH key on your local computer and add it to your
# Github account before using the following command. Follow the directions here:
# https://help.github.com/articles/generating-ssh-keys
$ git remote set-url origin git@github.com:yourUsername/yourReponame.git
# fork repo you want to work on
$ git clone https://github.com/yourUsername/yourReponame.git
# add changes to your forked repo
# make a pull request!
$ git pull # use this after someone else has made a change to the online repo
# your working on and you want to make your local repo up to date
$ git rm --cached localFileName
# add localFileName to .gitignore file
# then commit these changes
# push these changes to your repo!
# undo multiple commits
$ git reset --hard commitSHA###... # changes staging index and
# local folder to match online
# repository commit
# removing 3 commits from online github repo
$ git push -f origin HEAD^^^:branchNameToUndoLast3Pushs
git help
git help commit
| Command | Description |
|---|---|
git branch foo |
Create a new branch |
git switch foo |
Switch to a branch |
git switch -c|--create foo |
Create and switch to a branch |
git restore foo.js |
Undo all changes on the foo.js file |
git checkout foo.js |
Undo all changes on the foo.js file |
git checkout foo |
Use git switch instead |
git checkout -b foo |
Use git switch -c instead |
git merge foo |
Merge branch into current branch |
| Command | Description |
|---|---|
git branch -d <branchname> |
Delete the local branch, show a warning |
git branch -D <branhcname> |
Force to delete branch |
git remote prune origin |
Cleanup remote deleted branch |
| Command | Description |
|---|---|
git pull --rebase --prune |
Get latest, rebase any changes not checked in and delete branches that no longer exist |
| Command | Description |
|---|---|
git add file.txt |
Stage file |
git add -p |
--patch file.txt` |
git mv file1.txt file2.txt |
Move/rename file |
git rm --cached file.txt |
Unstage file |
git rm --force file.txt |
Unstage and delete file |
git reset HEAD |
Unstage changes |
git reset --hard HEAD |
Unstage and delete changes |
git clean -f|--force -d |
Recursively remove untracked files from the working tree |
git clean -f|--force -d -x |
Recursively remove untracked and ignored files from the working tree |
| Command | Description |
|---|---|
git reset 5720fdf |
Reset current branch but not working area to commit |
git reset HEAD~1 |
Reset the current branch but not working area to the previous commit |
git reset --hard 5720fdf |
Reset current branch and working area to commit |
git commit --amend -m "New message" |
Change the last commit message |
git commit --fixup 5720fdf -m "New message" |
Merge into the specified commit |
git revert 5720fdf |
Revert a commit |
git rebase --interactive [origin/main] |
Rebase a PR (git pull first) |
git rebase --interactive 5720fdf |
Rebase to a particular commit |
git rebase --interactive --root 5720fdf |
Rebase to the root commit |
git rebase --continue |
Continue an interactive rebase |
git rebase --abort |
Cancel an interactive rebase |
git cherry-pick 5720fdf |
Copy the commit to the current branch |
| Command | Description |
|---|---|
git diff |
See difference between working area and current branch |
git diff HEAD HEAD~2 |
See difference between te current commit and two previous commits |
git diff main other |
See difference between two branches |
| Command | Description |
|---|---|
git log |
See commit list |
git log --patch |
See commit list and line changes |
git log --decorate --graph --oneline |
See commit visualization |
git log --grep foo |
See commits with foo in the message |
git show HEAD |
Show the current commit |
git show HEAD^ or git show HEAD~1 |
Show the previous commit |
git show HEAD^^ or git show HEAD~2 |
Show the commit going back two commits |
git show main |
Show the last commit in a branch |
git show 5720fdf |
Show named commit |
git blame file.txt |
See who changed each line and when |
| Command | Description |
|---|---|
git stash push -m "Message" |
Stash staged files |
git stash --include-untracked |
Stash working area and staged files |
git stash --staged |
Stash staged files |
git stash list |
List stashes |
git stash apply |
Moved last stash to working area |
git stash apply 0 |
Moved named stash to working area |
git stash clear |
Clear the stash |
| Command | Description |
|---|---|
git tag |
List all tags |
git tag -a|--annotate 0.0.1 -m|--message "Message" |
Create a tag |
git tag -d|--delete 0.0.1 |
Delete a tag |
git push --tags |
Push tags to remote repository |
| Command | Description |
|---|---|
git remote -v |
List remote repositories |
git remote show origin |
Show remote repository details |
git remote add upstream <url> |
Add remote upstream repository |
git fetch upstream |
Fetch all remote branches |
git rebase upstream/main |
Refresh main branch from upstream |
git remote -v |
List remote repositories |
git push --force |
Push any changes while overwriting any remote changes |
git push --force-with-lease |
Push any changes but stop if there are any remote changes |
git push --tags |
Push tags to remote repository |
| Command | Description |
|---|---|
git submodule status |
Check status of all submodules |
- Pull submodules
git submodule syncgit submodule initgit submodule update
- Change branch
cd /submodulegit fetch origin <branch-name>git checkout <branch-name>cd /
Add & commit
git commit -am 'commit message'
Commit empty change
git commit --allow-empty -m k3;
Take a commit change of another branch
git cherry-pick <commit-hash>
Add any file
git add task2.txt
Merge current change to previous commit and will also change the commit hash
git commit --amend -m 'new message'
Merge remote 'branch-1' with current branch
git merge origin <branch-1>
git mergetool
git merge --squash <privateFeatureBranch>
Preventing unintentional staging or commiting of files
logs/
*.notes
pattern*/
Save a file with desired paterns as .gitignore with either direct string matches or wildcard globs.
git config --global core.excludesfile [file]
system wide ignore patern for all local repositories
Rewriting branches, updating commits and clearing history
git rebase [branch]
apply any commits of current branch ahead of specified one
git reset --hard [commit]
clear staging area, rewrite working tree from specified commit
Temporarily store modified, tracked files in order to change branches
git stash
Save modified and staged changes
git stash list
list stack-order of stashed file changes
git stash pop
write working from top of stash stack
git stash drop
discard the changes from top of stash stack
Retrieving updates from another repository and updating local repos
git remote add [alias] [url]
add a git URL as an alias
git fetch [alias]
fetch down all the branches from that Git remote
git merge [alias]/[branch]
merge a remote branch into your current branch to bring it up to date
git push [alias] [branch]
Transmit local branch commits to the remote repository branch
git pull
Versioning file removes and path changes
git rm [file]
delete the file from project and stage the removal for commit
git mv [existing-path] [new-path]
change an existing file path and stage the move
git log --stat -M
show all commit logs with indication of any paths that moved fetch and merge any commits from the tracking remote branch
Working with snapshots and the Git staging area
git status
show modified files in working directory, staged for your next commit
git add [file]
add a file as it looks now to your next commit (stage)
git reset [file]
unstage a file while retaining the changes in working directory
git diff
diff of what is changed but not staged
git diff --staged
diff of what is staged but not yet commited
git commit -m “[descriptive message]”
commit your staged content as a new commit snapshot
Github:
bit.ly/shakil0090
Git Official Documentation:
git-scm.com/doc
GitHub Learning Lab:
https://lnkd.in/dfQY6Jtp
Codecademy Course
https://lnkd.in/dwG5_C6q
Pro Git: by Scott Chacon [Book]
git-scm.com/book/en/v2
YouTube
FreeCodeCampOrg- beginer : rb.gy/ljxt5s