Is there a way to make a patch with git diff which excludes some files?
you could make a commit of what you want, then git format-patch that commit
I am not sure I can see how to do that
Is it normally OK to habd-edit the patch file as an easier-to-understand alternative?
I rather want to separate the 8i20/sserial patch from the bldc-driver stuff. However my current branches all contain a mixture of both (I am not really safe to be let loose with git)
Hi Sam! I trust some are in Wichita tonight? Are you there too? Sorry I couldn't make it this time.
EMC: 03jepler 07v2.4_branch * rc9c7ebfa472d 10/src/hal/drivers/parport_common.h: ppmc hm2_7i43 pluto: use specified base_hi as fallback
KimK: I'm in wichita and I see a distinct lack of skunkworks here
KimK: sorry you couldn't make it to this one
jepler: Thanks, how many made it?
KimK: me, chris, seb, steve, leo, arty, and one other guy whose name I'm ashamed to say has escaped me
the last three are newer to emc
Excellent, good turnout I think. I'll be there in spirit. I'm returning to Omaha but pausing in Minden to work more on the Kasugas. I broke something during the 8.04 to 10.04 upgrade (no, that wasn't it, it was my extensive ini fiddling, lol) but I don't think I need help, not yet anyway. Then some PyVCP & ladder upgrades, and finally on to finish the tool changer ladder. We'll see how far I get during the mini-fest.
So are the developers working together on any projects at the mini-fest?
Stuart is here too
KimK: we're playing with the puma :-)
seb_kuzminsky: Hi Seb, that's great! Let us know how it goes. Maybe post a short technical description and a video for us?
seb_kuzminsky: pinout: http://emergent.unpy.net/files/sandbox/svst8_8.pin
Dave911_ is now known as Dave911
I'm back now after power failure and recovery (it's snowing here).
EMC: 03swpadnos 07master * rcbd79ed6caf7 10/src/hal/components/pwmgen.c: Fix rare problem with freqgen output getting stuck "on"
EMC: 03swpadnos 07master * r60398d2abee4 10/docs/man/man9/hostmot2.9: Merge branch 'master' of ssh://git.linuxcnc.org/git/emc2
how'd that second one get in there?
the puma moved
well, one joint did
the puma at stuarts was stepper driven - wasn;t it?
skunkKandT: steppers & encoders, heyep
really? I wonder what they used the encoders for.
are you guys playing with joint/axis branch on that?
they're about a thousand miles away from needing kinematics
seb_kuzminsky: Is there a better way to determine the board type than idrom.board_name? led.c looks for "hm2_5i23" but it seems that this Bitfile uses "MESA5I23". I am puzzled why I don't see the error message too.
alex_joni: have you been keeping track of rtai/xenomai/adeos/whatever lately?
oh, and hi :)
Bah! my git patches keep trying to patch .gitignore, and adding .gitignore to .gitignore just makes it worse!
andypugh: you may use .git/info/exclude
it's like .gitignore bot out of tree
Worth a try.
andypugh: you don't use a global .gitignore?
That is the one it keeps adding to my diff files.
(Unless by "global" you mean somewhere outside the git repository?
yes outside of the git folders
[20:29:53] <JT-Hardinge> http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl?Git#Use_a_global_ignore_file_for_editor_backups
it is in my home directory on my machines
Seems to help.
ries_ is now known as ries