Current folder:
git clone https://github.com/mathieugouin/hello-world.git .
New folder:
git clone https://github.com/mathieugouin/hello-world.git new-folder
Check what changed:
git status
Check what changed (simple view):
git status -s
Add to staging:
git add <filename>
Commit to local repo:
git commit -m "commit message"
Simultaneous auto add all changed files & commit to local repo:
git commit -a -m "commit message"
Push local repo to remote repo (server):
git push <remote-name> <branch-name> Example: git push origin master
Retrieve changes done by others (forcing merge when required):
git pull origin master --no-rebase
Nice & Pretty log:
git log --oneline --decorate --graph --all
Revert local changes
git reset --hard
Revert local changes single file
git checkout -- filename.txt
Revert last commit
git reset --soft HEAD~1
List:
git branch
List all:
git branch -a
Create new branch:
git branch <branch-name>
Create new branch from another branch:
git branch <branch-name> <other-branch-name>
Create new branch + switch to it:
git checkout -b <branch-name>
Checkout a new local branch tracking a remote:
git checkout --track origin/<branch-name>
Switch to branch:
git checkout <branch-name>
Retrieve all remotes branch
git fetch origin
Switch to a newly fetched remote branch
git checkout --track origin/<branch>
Set upstream:
git branch --set-upstream-to=origin/<branch> master
Merge branch1 into master:
git checkout master && git merge branch1
Merge branchX into a single commit (will not be shown as merged)
git merge --squash branchX
List all tag
git tag
Create a new annotated tag + message
git tag -a -m "Tag message" TAG_NAME
Push specific tag
git push origin TAG_NAME
Push all tags
git push --tags
Delete tag
git tag -d TAG_NAME
Diff between 2 branches
git diff branchA branchB
Diff between 2 branches, single file
git diff branchA branchB -- file.c
Diff show only affected files
git diff --name-only
List all remote
git remote -v
Add new remote
git remote add upstream https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git
git fetch upstreamgit checkout mastergit merge upstream/mastergit push origin master
Rebasing branch1 from master:
git checkout branch1 && git rebase master
2 steps:
- Interactive rebase
git rebase -i <first commit HASH to sqash to>then use pick as the first one, then s. - Force pushing to remote
git push -f origin <branch_name>
Squash last 2 commits: git rebase --interactive HEAD~2 then use pick as the first one, then s.
https://chrisjean.com/git-submodules-adding-using-removing-and-updating/
Remove submodule
git rm path/to/submodule