2018-02-05 02:27:07 +00:00
|
|
|
# Branching
|
2019-11-23 16:05:04 +00:00
|
|
|
```bash
|
2018-02-05 02:27:07 +00:00
|
|
|
# Create a new branch.
|
|
|
|
git branch <branchName>
|
|
|
|
|
2019-02-19 19:22:04 +00:00
|
|
|
# Create a new branch at a specific commit, and switch to it.
|
|
|
|
git checkout -b <branchName> 3f4308df1e0b7f663d851108128e8e53deb1b5fb
|
|
|
|
|
2018-02-05 02:27:07 +00:00
|
|
|
# Switch to an existing branch.
|
|
|
|
git checkout <branchName>
|
|
|
|
git checkout master
|
|
|
|
|
|
|
|
# Checkout and switch to a new branch.
|
|
|
|
git checkout -b my_new_branch
|
|
|
|
|
|
|
|
# Push the new branch to a remote.
|
|
|
|
git push -u origin my_new_branch
|
|
|
|
|
|
|
|
# Alternative way to push a branch to a remote, without permanently setting the upstream.
|
|
|
|
git push origin my_new_branch
|
|
|
|
|
|
|
|
# Checkout a remote branch.
|
|
|
|
git checkout --track origin/<branchName>
|
|
|
|
|
|
|
|
# Merge changes from master into a branch.
|
|
|
|
git checkout <branchName>
|
|
|
|
git merge master
|
|
|
|
|
|
|
|
# Abort a merge (such as if there's conflicts that need to be resolved differently).
|
|
|
|
git merge --abort
|
|
|
|
|
|
|
|
# Delete a branch.
|
|
|
|
git branch -d my_new_branch
|
|
|
|
|
|
|
|
# Delete a branch on the remote.
|
|
|
|
git push origin :my_new_branch
|
|
|
|
|
|
|
|
# Do a dry run of pruning local branches that no longer exist on a remote.
|
|
|
|
git remote prune origin --dry-run
|
|
|
|
|
|
|
|
# Show all current branches, including remotes.
|
|
|
|
git show-branch -a --list
|
|
|
|
|
2018-04-20 15:49:59 +00:00
|
|
|
# Show all local branches that have been merged into master.
|
|
|
|
git branch --merged
|
|
|
|
|
|
|
|
# Show all local branches that have not been merged into master.
|
|
|
|
git branch --no-merged
|
|
|
|
|
2019-05-22 13:13:58 +00:00
|
|
|
# Show all local branches, sorted by and showing last commit
|
|
|
|
# https://stackoverflow.com/a/5188364/11912
|
|
|
|
git for-each-ref --sort=committerdate refs/heads/ --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(color:red)%(objectname:short)%(color:reset) - %(contents:subject) - %(authorname) (%(color:green)%(committerdate:relative)%(color:reset))'
|
|
|
|
|
2018-07-24 17:58:41 +00:00
|
|
|
# Merge two local branches, without fast-forwarding, with default editor opening to modify the message.
|
|
|
|
git merge <branchName> --no-ff --edit
|
|
|
|
|
2018-02-05 02:27:07 +00:00
|
|
|
# Merge two local branches, without fast-forwarding, and including messages for the last X (20 here) commits.
|
|
|
|
# According to Linus Torvalds, the better way to do merges.
|
|
|
|
git merge <branchName> --log=20 --no-ff
|
2018-02-07 16:56:43 +00:00
|
|
|
|
2019-02-19 19:14:18 +00:00
|
|
|
# While on a different branch, update the master branch from remote.
|
2019-02-19 19:22:04 +00:00
|
|
|
# See https://stackoverflow.com/a/42902058/11912
|
2019-02-19 19:14:18 +00:00
|
|
|
git fetch origin master:master
|
|
|
|
|
2019-02-19 19:22:04 +00:00
|
|
|
# Put recent local commits in master into a new branch.
|
2018-02-07 16:56:43 +00:00
|
|
|
# X is the number of commits to rollback.
|
|
|
|
git branch <branchName>
|
|
|
|
git reset --hard HEAD~X
|
|
|
|
git checkout <branchName>
|
2019-05-29 13:53:09 +00:00
|
|
|
|
|
|
|
-- Add a specific commit on top of the current branch.
|
|
|
|
git cherry-pick a6e1e5ad
|
|
|
|
```
|