gistfile2.txt

]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]

Unnamed File

Vienna:gitscm pieter$ git am 0001-Simplify-image-processing-code.patch
Applying: Simplify image processing code
/Users/pieter/gitscm/.git/rebase-apply/patch:19: trailing whitespace.
  html.gsub!('src="images', 'src="assets/images') if type == :pdf  
error: patch failed: script/html.rb:31
error: script/html.rb: patch does not apply
Patch failed at 0001.
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
Vienna:gitscm pieter$ git st
# On branch book
# Your branch is ahead of 'origin/book' by 1 commit.
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	0001-Simplify-image-processing-code.patch
nothing added to commit but untracked files present (use "git add" to track)
Vienna:gitscm pieter$