Income Sources :: Guides :: Git

readme.md

Income Sources :: Guides :: Git

⪼ Made with 💜 by realpolyglot.dev

• Income Sources

Git

• Git
• Git :: Hooks
• Git :: Workflows

How to Undo a Merge in Git

• How to Undo a Merge in Git
• "git reset --merge"
• "git merge --no-commit"

...

git checkout new/api-0001-add-screenshots-resource
git pull
git checkout -
git merge new/api-0001-add-screenshots-resource
git conflicted
git diff api/routes/index.ts
git checkout --ours api/routes/index.ts

one branch every \n

git branch | awk -F'*' '{ print $1,$2 }' | tr -d ' '

interactive, select branch

git branch | awk -F'*' '{ print $1,$2 }' | tr -d ' ' | fzf

interactive, select branch & checkout

git checkout (git branch | awk -F'*' '{ print $1,$2 }' | tr -d ' ' | fzf)

checkout last branch selected

git checkout -

merge previously activated branch

git merge @{-1}