Re: [git-users] git am patch does not apply on removed file

2013-11-10 Thread Philip Oakley
- 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

Re: [git-users] git am patch does not apply on removed file

2013-11-10 Thread Ken Tanzer
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

Re: [git-users] git am patch does not apply on removed file

2013-11-10 Thread Philip Oakley
Oakley Sent: Sunday, November 10, 2013 8:30 PM Subject: Re: [git-users] git am patch does not apply on removed file 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

Re: [git-users] git am patch does not apply on removed file

2013-11-10 Thread Philip Oakley
...@vger.kernel.org (No HTML, plain text only) \bike shedding - Original Message - From: Philip Oakley To: Ken Tanzer ; git-users@googlegroups.com Sent: Sunday, November 10, 2013 11:03 PM Subject: Re: [git-users] git am patch does not apply on removed file Hi Ken, the 'git am' is a shell