Ungit

From Athenaeum
Jump to: navigation, search

Create Branch

  • No master branch (this will contain whatever is currently in the working directory):
  1. git checkout -b master
  • Existing master branch:
  1. switch to master branch
  2. press the plus to create a new branch
  3. check out that branch, make changes, and commit to that branch

Squash Merge

  1. prepare to merge by checking out master branch
  2. click/select branch name "master" and then click squash on the branch you've been working on
  3. all the changed files should show up. enter a new commit message that will be added to the master branch history

Rebase on Master

  1. make sure the branch you've been working on is checked out
  2. click the name of the branch you've been working on and then click rebase next to master branch
  3. if using a remote origin: click the name of the branch you've been working on and then click push to update the remote origin