* How to apply patches @ 2010-11-17 10:00 Ananth 2010-11-17 14:13 ` Tay Ray Chuan 0 siblings, 1 reply; 3+ messages in thread From: Ananth @ 2010-11-17 10:00 UTC (permalink / raw) To: git Hi, I have created a git repository on a remote site and have created patches there. I have copied the files for the base version using which I had created the patch. However, when I use git apply --check, I get error as patch does not apply. Can anyone please help? I'm stuck at this and is very important for my workflow. -- View this message in context: http://git.661346.n2.nabble.com/How-to-apply-patches-tp5747036p5747036.html Sent from the git mailing list archive at Nabble.com. ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: How to apply patches 2010-11-17 10:00 How to apply patches Ananth @ 2010-11-17 14:13 ` Tay Ray Chuan 2010-11-17 15:01 ` Ananth 0 siblings, 1 reply; 3+ messages in thread From: Tay Ray Chuan @ 2010-11-17 14:13 UTC (permalink / raw) To: Ananth; +Cc: git Hi, On Wed, Nov 17, 2010 at 6:00 PM, Ananth <smilewithani@gmail.com> wrote: > I have copied the files for the base version using which I had > created the patch. Did you $ git add . # note the <dot> and $ git commit the destination ("base version") repo before applying? -- Cheers, Ray Chuan ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: How to apply patches 2010-11-17 14:13 ` Tay Ray Chuan @ 2010-11-17 15:01 ` Ananth 0 siblings, 0 replies; 3+ messages in thread From: Ananth @ 2010-11-17 15:01 UTC (permalink / raw) To: git Hi Tay Ray, Thanks for the reply. the problem is now resolved. The problem was that the patches created were in Unix format (only CR) while when I uploaded the patches through FTP site, they were converted to Windows format (CRLF) which was preventing from the patches from getting applied. I changed the files to unix format again and the problem got resolved. -- View this message in context: http://git.661346.n2.nabble.com/How-to-apply-patches-tp5747036p5748001.html Sent from the git mailing list archive at Nabble.com. ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-11-17 15:01 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-11-17 10:00 How to apply patches Ananth 2010-11-17 14:13 ` Tay Ray Chuan 2010-11-17 15:01 ` Ananth
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).