Jump to main component vim

Vim/Neovim

yank filename without extension to 'f'-registry

:let @f = expand('%:t:r')<CR>

search for "const [contents in 'f'-registry]"

:execute '/const ' . @f<CR>:nohlsearch<CR>

added together

:let @f = expand('%:t:r')<CR>:execute '/const ' . @f<CR>:nohlsearch<CR>

Ideavim

Copy file name to + register and search for it. Do not execute immediately () as CopyFileName also includes the file extension

:action CopyFileName<CR>/const <c-r>+

navigate git history

Go forward / List ancestry (later) commits

• https://stackoverflow.com/questions/6759791/how-do-i-move-forward-and-backward-between-commits-in-git

From HEAD (older commit) to main branch (up-to-date)

git log --reverse --ancestry-path HEAD^..main

• https://stackoverflow.com/questions/2263674/how-do-i-find-the-next-commit-in-git-child-children-of-ref

stuff

git checkout HEAD^ # back
git checkout HEAD@{1} # go to previous HEAD position

Copy file from another branch

git checkout another-local-branch path/to/file.js

• https://stackoverflow.com/questions/2364147/how-to-get-just-one-file-from-another-branch

tiled window margins

https://appleinsider.com/inside/macos-sequoia/tips/how-to-turn-off-the-gaps-in-macos-sequoias-window-tiling

margins (default):

set "no margins"

no margins:

Unstage a file / remove from index

git restore --staged file-name.txt

Yadm

https://yadm.io/

Add all yadm managed files

yadm add -u

Open Lazygit for Yadm

yadm enter lazygit

compare branch with main

CLI

git diff main..HEAD # does not include uncommitted changes

git diff main..$(git branch --show-current) # does not include uncommitted changes

If MR author forgot to bring feature up to date with main.

Compare against main at the time when branch was created.

git diff $(git merge-base main HEAD) HEAD

git show $(git branch --show-current)

git branch --show-current is current branch

Lazygit

1. Highlight main branch
2. Shift w & hit enter
3. highlight the branch you want to compare with

Webstorm

1. GitToolBox? Should not be necessary I think

https://useful-snippets.netlify.app/posts/webstorm-compare-with-branch/

VS Code

1. Gitlens?

Neovim

1. Diffview

Docker arguments

https://github.com/cypress-io/cypress-docker-images/tree/master/factory

Accept your changes - rebase merge conflicts

git tag branch_before_rebase
git rebase -X theirs develop

• Manually compare current branch with branch_before_rebase
• Correct whatever needs to be corrected

Grep examples

Grep:

grep -4 \"peerDependencies\" node_modules/stylelint-config-standard-scss/package.json

Ripgrep:

rg peerDependencies

Revert changes introduced in old commit

Reverse apply changes from old commit

git checkout <commit-hash>
git log # copy previous commit hash
git diff <previous-commit-hash> > diff.patch
git checkout <main-or-up-to-date-branch>
git apply diff.patch --reverse

Create new commit that revert last commit

git revert <last-commit-hash>

File ownership

stat filename

or

ls -l

Change ownership

chmod o=rx filename