- Original Message -
From: Ken Tanzer
To: git-users@googlegroups.com
Sent: Sunday, November 10, 2013 8:49 AM
Subject: [git-users] git am "patch does not apply" on removed file
Hello. I have some patches I was having problems with, and have boiled
down a simple example. If I try to rem
Hi Philip, and thanks for the reply. I've tried this on two Linux
machines--Ubunut 13.04 with git 1.8.1.2, and Centos 6 with git 1.7.1.
If I pull the update into another repository, I can merge it fine, so this
problem is really with the patch. It looks to me like either format-patch
or am ar
Hi Ken,
the 'git am' is a shell script 'git-am.sh' see
https://github.com/git/git/blob/master/git-am.sh for a bit of debugging...
Philip
[sorry for the top post on these HTML emails]
- Original Message -
From: Ken Tanzer
To: git-users@googlegroups.com
Cc: Ken Tanzer ; Philip O
Also noticed this at the end of the patch file
"
\ No newline at end of file
--
1.8.1.2
"
Which suggests that the problem may be related to the lack of the LF at EOF of
jquery-ui-1.8.custom.min.js
If it is repeatable with a simple test case, do report via the developers list
g...@vger.kernel.o
