I copied the entire pyjamas dir to pyjamas_mod, so (exactly) what would i have to write then?
I must say that i have taught myself many o software on the computer, from 3d animation to video editing and python, but i can not remember ever using anything as unituitive as git ;) Seriously someone at apple should reinvent that shit so that decent hard working tax paying schmucks like me can use it! I noticed there is a git gui tool, but it doesnt seem to be able to create patches at all. Then i tried a tool called winmerge but it couldnt compare whole folders. grrr </rant> G On Thu, Dec 15, 2011 at 11:31 PM, C Anthony Risinger <anth...@xtfx.me> wrote: > On Thu, Dec 15, 2011 at 12:39 PM, Gustaf Nilsson <gus...@laserpanda.com> > wrote: >> Lol i think i spot a problem already! >> >> I duplicated (the latest) pyjamas dir to pyjamas_mod which i made my >> changes in, then used "git diff pyjamas pyjamas_mod > showcase.patch" >> to generate this file. now i see that it actually has the pyjamas_mod >> directory name in the patch file. is that a problem and how do i >> unproblematise it? > > why duplicate anything? git (or any VCS really) it used specifically > to avoid such behavior :-) > > to correct (assuming `origin/master` is upstream [should be after a clone]): > > # git checkout -b bug667 origin/master > # rm -rf library/pyjamas > # mv library/pyjamas_mod library/pyjamas > # git diff > ^^^^^^ make sure it looks correct! > # git commit -am "bug667: blah blah blah, yada yada, so on and so forth" > # git diff origin/master > mypatch-bug667.patch > > ... did you copy `library/pyjamas`, or the *entire* pyjamas directory > after a clone? the above applies to the former, but the latter would > follow a similar method. > > -- > > C Anthony -- ■ ■ ■ ■ ■ ■ ■ ■ ■ ■
