Skip to content

Instantly share code, notes, and snippets.

@vc7
Last active August 29, 2015 14:01
Show Gist options
  • Select an option

  • Save vc7/d4119ec8fecd4dad041d to your computer and use it in GitHub Desktop.

Select an option

Save vc7/d4119ec8fecd4dad041d to your computer and use it in GitHub Desktop.
  • no fast forward: git merge --no-ff

Regular Usage

  • stage the unstaged files, deleted filed included: git add -u
  • unstage a file: git reset [filename]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment