Mabdelwanis/common-git-cmds.md

Forked from L1ghtmann/common-git-cmds.md

Created November 28, 2025 23:10

Star (0) You must be signed in to star a gist
Fork (0) You must be signed in to fork a gist

Select an option

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/Mabdelwanis/47ca3703aacbbcbc9d5f4f1334a2e196.js"></script>
Save Mabdelwanis/47ca3703aacbbcbc9d5f4f1334a2e196 to your computer and use it in GitHub Desktop.

Download ZIP

Common git commands I forget

Raw

common-git-cmds.md

Git Commands

Note: SSH url format

[email protected]:name/repo.git

Add contributor remote branch for edits

git remote add contributor https://github.com/name/repo.git
git fetch contributor
git checkout -b update contributor/master
git push contributor update:master

Add upstream remote branch for ref

git remote add upstream https://github.com/whoever/whatever.git
git fetch upstream
git pull upstream [target branch]

Squash all commits on top of main branch

git checkout <new branch/fork>
git reset --soft $(git merge-base $(git rev-parse --abbrev-ref HEAD) [master/main])
git commit -m "Squashed commit"

Add project to GitHub

Create repo on GitHub
git init in proj dir
git remote add origin [ssh_link_for_repo]
git remote -v (to confirm)
when ready:
1. git add .
2. git commit -m “message”
3. git branch -M main
4. git push -u origin main

Rename branch

git branch -m [new_name] (local)
git push origin -u [new_name] (remote)
git push origin :[old_name] (old remote)

Compare two branches

git diff [branch to compare]

Cherry-pick commits from one branch to another

git cherry-pick [commit hash]
1. if theres a conflict, go into the file and delete the bit trying to override + "=====" + branch headers
2. git add [changed file(s)]
3. git cherry-pick --continue

Add submodule to custom location

git submodule add <link>.git
git mv <submodule-dir> /new/location/name

Update submodules

git submodule update --remote --merge

Scrap submodule changes from branch head

git submodule deinit -f --all
git submodule update --init OR
git submodule foreach --recursive git reset --hard
git submodule update --recursive

To go back n commits (won’t work for initial commit)

git reset --hard HEAD~n || git reset --hard HEAD^ (for back one)
git push origin [branch] -f

To go forward n commits (won’t work for initial commit)

git reset --hard HEAD@{n}
git push origin [branch] -f

To amend a commit's content

git commit --amend --no-edit
git push origin [branch] -f

To amend a commit's message

git commit --amend
git push origin [branch] -f

Remove current, uncommited changes

git checkout .

Remove current, commited changes

git reset --soft HEAD~1 [keeps work]
git reset --hard HEAD~1 [deletes work]

Remove commit(s) from branch

n = # of commits to view

git rebase -i HEAD~n
see the descriptions for what can be done
change the text in front of the sha1 and save to do the actions
when done, check git log that everything worked as intended
if so, git push origin [branch] -f

Squash current commits

git checkout custom-branch
git reset --soft $(git merge-base base-branch HEAD)
git commit -m "My commit!"

To start a clean main branch (remove commit history)

git checkout --orphan [tmp_branch]
git add -A
git commit -am "message"
git branch -D [old_branch]
git branch -m [old_branch]
git push -f origin [old_branch]

To remove old remote branches

git remote update origin --prune

To remove all but a select few remote branches

git branch -a | grep -v "keep" | xargs -I{} echo {} | sed -e 's/^ *//' -e 's/remotes\/origin\///' | xargs git push origin --delete

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment