Skip to content

Instantly share code, notes, and snippets.

@mike1011
Last active May 5, 2022 23:30
Show Gist options
  • Save mike1011/615c7deb7ccbd5984a61c69f718196c7 to your computer and use it in GitHub Desktop.
Save mike1011/615c7deb7ccbd5984a61c69f718196c7 to your computer and use it in GitHub Desktop.
###################################### UBUNTU ###############################################
==== to search by port ======
lsof -wni tcp:3000
==== to kill by port ========
sudo kill -9 `sudo lsof -t -i:3000`
==== another way to search and kill a process using port ===
sudo lsof -i -P -n | grep 6379
sudo kill -9 <process_id>
==== another way to search by process name =========
sudo ps aux | grep elasticsearch
====== give read/write permission to a file =======
sudo chmod -R a+rwx myfile
##################################### GITHUB ###################################################
git reset HEAD^ --hard (Discard changes, back to last commit)
====git rebase and push again ======
git pull --rebase origin master
git push -f origin <name of your branch>
==== git status with local deleted files removed=====
git rm `git status | grep deleted | awk '{print $2}'`
===remove file from commit OR reset it again===
git reset --hard origin/master
git checkout origin/master config/application.yml
==== get list of files changes between current branch (HEAD) and master
git diff --name-status master..HEAD
==== remove/undo one merge in the Pull Request=======
git revert -m 1 [sha_of_pull_request_merge]
πŸ” Status
======Check the status of working directory and staging area:====
git status
=====Show changes between HEAD and working directory:====
git diff
====Show the list of commits in one line format:====
git log --oneline
=====Show commits that make add or remove a certain string:====
git log -S 'LoginViewController'
===Search commits that contain a log message:====
git log β€” all β€” grep=’day of week’
====πŸ” Tag
=====List all tags:====
git tag
=====Tag a commit:
git tag -a 1.4 -m "my version 1.4"
======Delete remote tags:=====
git push --delete origin tagname
git push origin :tagname
=====Push tag to remote:====
git push origin tagname
=====Rename tag:=====
git tag new old
git tag -d old
git push origin :refs/tags/old
git push --tags
Move tag from one commit to another commit:
git push origin :refs/tags/<tagname>
git tag -fa tagname
git push origin master --tags
πŸ” Remote
====List all remote:======
git remote
====Rename remote:=====
git remote rename old new
Remove stale remote tracking branches:
git remote prune origin
πŸ” Branch
====List all branches:=====
git branch
Create the branch on your local machine and switch in this branch:
git checkout -b branch_name
====Create branch from commit:=====
git branch branch_name sha1_of_commit
====Push the branch to remote:=====
git push origin branch_name
=====Rename other branch:====
git branch -m old new
====Rename current branch:=====
git branch -m new
=====Rename remote branch:=======
git branch -m old new # Rename branch locally
git push origin :old # Delete the old branch
git push --set-upstream origin new # Push the new branch, set local branch to track the new remote
====Delete a branch:======
git branch -D the_local_branch
git push origin :the_remote_branch
Delete all local branches but master
git branch | grep -v "master" | xargs git branch -D
πŸ” Commit
====Undo last commit:=====
git reset --hard HEAD~1
====Squash last n commits into one commit:====
git rebase -i HEAD~5
git reset --soft HEAD~5
git add .
git commit -m "Update"
git push -f origin master
=====Move last commits into new branch:=====
git branch newbranch
git reset --hard HEAD~3 # Go back 3 commits. You *will* lose uncommitted work.*1
git checkout newbranch
πŸ” Cherry Pick
Add some commits to the top of the current branch:
git cherry-pick hash_commit_A hash_commit_B
πŸ” Reflog
====Show reflog:=====
git reflog
====Get commit:=======
git reset --hard 0254ea7
git cherry-pick 12944d8
πŸ” Revert
====Revert the previous commit:======
git revert HEAD
git commit
Revert the changes from previous 3 commits without making commit:
git revert --no-commit HEAD~3..
πŸ” Amend
====Amend previous commit:=====
git commit --amend
git commit --amend --no-edit
git commit --amend -m "New commit message"
Changing git commit message after push:
git commit --amend -m "New commit message"
git push --force <repository> <branch>
πŸ” Checkout
====Checkout a tag:====
git checkout tagname
git checkout -b newbranchname tagname
====Checkout a branch:=====
git checkout destination_branch
====Use -m if there is merge conflict:=====
git checkout -m master // from feature branch to master
====Checkout a commit:=====
git checkout commit_hash
git checkout -b newbranchname HEAD~4
git checkout -b newbranchname commit_hash
git checkout commit_hash file
Checkout a file:
git checkout c5f567 -- Relative/Path/To/File
πŸ” Stash
=====Save a change to stash:=====
git stash save "stash name"
git stash
List all stashes:
git stash list
Apply a stash:
git stash pop
git stash apply
git stash apply stash@{2}
πŸ” Rebase
======Rebase the current branch onto master:=====
git rebase master // rebase the current branch onto master
Continue rebase:
git rebase --continue
Abort rebase:
git rebase --abort
πŸ” .gitignore
=====Un-track files that have just been declared in .gitignore:=====
git rm -r --cached .
git add .
git commit -am "Remove ignored files"
πŸ” Index
=====Remove untracked files:====
git clean
====Remove file from index:=====
git reset file
=====Reset the index to match the most recent commit:=====
git reset
Reset the index and the working directory to match the most recent commit:
git reset --hard
πŸ” Misc
=====Get their changes during git rebase:======
git checkout --ours foo/bar.java
git add foo/bar.java
====Get their changes during git merge:=====
git pull -X theirs
git checkout --theirs path/to/the/conflicted_file.php
git checkout --theirs .
git add .
git checkout branchA
git merge -X theirs branchB
====Merge commits from master into feature branch:====
git checkout feature1
git merge --no-ff master
====Find bug in commit history in a binary search tree style:===
git bisect start
git bisect good
git bisect bad
======================== REACTJS (ES6) COMMON COMMANDS AND UTILITIES ==================================
---- for Arrays ------
===check if array ====
Array.isArray(tag_list)
=== remove duplicate===
const uniqArrayElements = [...new Set(arrayWithDuplicateElements)];
=== flatten two arrays into one ===
[selectedItems, Items].flat()
=== add into existing Array ===
myArray.concat('new array value');
=== filter and remove empty elements ===
myArray.filter(o => o)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment