Git Branch¶

git branch -vv
#if it shows that the tracking branch is not upstream/master
# we need to fix it as below

git fetch upstream

git checkout master
git reset --hard upstream/master
git branch --set-upstream-to upstream/master

git branch             #list all local branches
git branch -r          #list all remote branches
git branch -a          #list both local and remote branches
git branch --merged    #list all branches that have been merged
git branch --no-merged #list all branches not merged

git branch -m master main       #local
git push -u origin main         #remote
git push origin --delete master #delete remote master

git branch <new-branch>
git checkout -b <new-branch>  #create and switch to

git checkout -b <new-branch> <commit-hash or HEAD~i>

git checkout -b <local-branch> origin/<remote-branch>
...
git push -u origin <branch-name> # local/remote branches have the same name, automatic tracking
git push origin <local-branch>:<remote-branch> # push from specific local to remote branch, no automatic tracking

#checkout branch to copy
git checkout dev

#create new branch
#git checkout -b dev-test [current_active_branch]
git checkout -b dev-test

#push changes in dev-test to remote
git push origin dev-test

git reflog show --all             #get sha1 of the deleted branch
git branch <NewBranchName> <sha1> #restore the branch

git branch -d <branch-name> #delete merged branch
git branch -D <branch-name> #force delete branch (even if not merged)

# UNIX
git branch --merged | egrep -v "(^\*|master|main|develop)" | xargs git branch -d    #merged
git branch --no-merged | egrep -v "(^\*|master|main|develop)" | xargs git branch -D #unmerged

# PowerShell: `%` shortcut to foreach, `$_` is the piped variable
git branch --merged | Where-Object { !($_ | Select-String "master|main|develop" -quiet) } | %{git branch -d $_.Trim()}
git branch --no-merged | Where-Object { !($_ | Select-String "master|main|develop" -quiet) } | %{git branch -D $_.Trim()}

git push origin --delete <branch-name>

git branch -r --merged | egrep -v "(^\*|master|main|develop)" | sed 's/origin\///' | xargs -n 1 git push origin --delete #UNIX
git branch -r | Where-Object { !($_ | Select-String "HEAD|upstream|master|main|develop" -quiet) } |
  %{$_ -replace ([regex]::Escape('origin/'))} | %{git push origin --delete $_} #PowerShell

git remote add upstream remote-upstream-repo-url
git checkout my-branch
git pull upstream master
git push origin my-branch

#origin/master is the remote forked branch
# you need to push your changes to the forked branch (origin/master)
#add the upstream repo if not (forked from)
git remote add upstream https://github.com/whoever/whatever.git
#get all change from the upstream
git fetch upstream
#go to local master branch
git checkout master
#rewrite master branch based on upstream
git rebase upstream/master
#push local changes to forked repo (-f only needed the first time after rebased)
git push -f origin master