Permalink
Browse files

change git page

  • Loading branch information...
1 parent d1aa2c7 commit ee1e324fac6795e38907abbafb26b7b62e23e5b7 @netzfisch committed Feb 22, 2014
Showing with 4 additions and 1 deletion.
  1. +4 −1 static/git.md
View
5 static/git.md
@@ -57,8 +57,11 @@ e-mailable patches:
Apply a series of patches from a mailbox or a given one, e.g. '0001-use-unicorn-via-procfile'.
- $ git am 0001-use-unicorn-via-procfile
+ $ git am 0001-use-unicorn-via-procfile.patch
+Fall back on 3-way merge if the patch does not apply cleanly:
+
+ $ git am --3way 0001-use-unicorn-via-procfile.patch
[1]: http://git-scm.com/docs
[2]: /ruby/2010/01/29/git-basics.html

0 comments on commit ee1e324

Please sign in to comment.