Skip to content

Instantly share code, notes, and snippets.

@Celeborn2BeAlive

Celeborn2BeAlive/git_cheat_sheet.md

Created October 1, 2019 13:55
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save Celeborn2BeAlive/ca9bd896b0074ef286e307fcb3c2068b to your computer and use it in GitHub Desktop.
Save Celeborn2BeAlive/ca9bd896b0074ef286e307fcb3c2068b to your computer and use it in GitHub Desktop.
Download ZIP
Git Cheat Sheet
Raw
git_cheat_sheet.md

Apply patch

By default:

git apply my_diff.diff

If it does not apply, then:

git apply --reject my_diff.diff

Git will create files *.rej containing rejected revisions. They must be treated manually. Then run:

git -am resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment