[SLUG] Git - merging individual diffs?
A git question: how do I merge just *some* diffs from branch A into branch B? ie I want to do a sort of combination of git cherrypick git add -i (patch mode) - pull in some of the diffs from some of the files from A revision x into B's HEAD. I could just make another clone into another directory, git reset to revision x, and use vimdiff. But that seems inelegant :-) -- Sonia.-- SLUG - Sydney Linux User's Group Mailing List - http://slug.org.au/ Subscription info and FAQs: http://slug.org.au/faq/mailinglists.html
Re: [SLUG] Git - merging individual diffs?
Sonia Hamilton so...@snowfrog.net writes: A git question: how do I merge just *some* diffs from branch A into branch B? ie I want to do a sort of combination of git cherrypick git add -i (patch mode) - pull in some of the diffs from some of the files from A revision x into B's HEAD. There isn't anything automatic; I would probably use cherrypick to grab the whole diff, then 'rebase -i' to go back and split it the way I wanted, but that is reasonably manual too. Regards, Daniel -- ✣ Daniel Pittman✉ dan...@rimspace.net☎ +61 401 155 707 ♽ made with 100 percent post-consumer electrons Looking for work? Love Perl? In Melbourne, Australia? We are hiring. -- SLUG - Sydney Linux User's Group Mailing List - http://slug.org.au/ Subscription info and FAQs: http://slug.org.au/faq/mailinglists.html
[SLUG] Taxes on sending servers to the US
Hello, Does anyone here has experience sending servers (e.g. Dell PowerEdge 860 rack-mounted) TO the US? I'm going to visit our office overseas soon and we were wondering how much would it cost (tax-wise) to just pack a couple of them as a checked-in luggage. The sale closes soon so I need a quick answer. Thanks, --Amos -- SLUG - Sydney Linux User's Group Mailing List - http://slug.org.au/ Subscription info and FAQs: http://slug.org.au/faq/mailinglists.html
[SLUG] Text books on Monodevelopment
I want to install MonoDeveleopment on my box (Ubuntu) with the via to learning C#. I believe this package is also an IDE. I have cut code for over 20 years in various languages but never with an ICE. Consequently I am looking for a good test ha explains C# and this IDE. In the past I, my 1 or 2 of my employers have suggest the I learn C# via Visual Studio in my spare time at work. In each case the text book they supplied did not match the version of Visual studio installed Consequently I wasted more time struggling to match the text with the IDE than learning the language. Can anyone recommend a a good text that matches the MonoDevelopment's IDE. A google search recommended Practical Mono but Dymocks says it's out of print. Dymocks has several books about Visual Studio but nothing about Mono. Chris Allen -- SLUG - Sydney Linux User's Group Mailing List - http://slug.org.au/ Subscription info and FAQs: http://slug.org.au/faq/mailinglists.html
Re: [SLUG] Text books on Monodevelopment
Chris Allen wrote: I want to install MonoDeveleopment on my box (Ubuntu) with the via to learning C#. I believe this package is also an IDE. I have cut code for over 20 years in various languages but never with an ICE. Consequently I am looking for a good test ha explains C# and this IDE. Mono will always lag behind C#. You are probably best learning C# in Visual Studio and back porting your knowledge. In the past I, my 1 or 2 of my employers have suggest the I learn C# via Visual Studio in my spare time at work. In each case the text book they supplied did not match the version of Visual studio installed Consequently I wasted more time struggling to match the text with the IDE than learning the language. C# in a Nutshell will give you a comprehensive run through. (It is large. They must have big nuts in Perth.) Can anyone recommend a a good text that matches the MonoDevelopment's IDE. A google search recommended Practical Mono but Dymocks says it's out of print. Dymocks has several books about Visual Studio but nothing about Mono. The enthusiasm for writing texts about Mono seems to have waned. At http://www.mono-project.com/Books the books listed are over three years old. HTHAB. David -- SLUG - Sydney Linux User's Group Mailing List - http://slug.org.au/ Subscription info and FAQs: http://slug.org.au/faq/mailinglists.html
[SLUG] Invitation to connect on LinkedIn
LinkedIn Adam Bogacki requested to add you as a connection on LinkedIn: -- Slug, I'd like to add you to my professional network on LinkedIn. - Adam View invitation from Adam Bogacki http://www.linkedin.com/e/z9O5BgKkMTYCX-1mB0uYHD6zupb/blk/I270825912_3/0PnP8NejkOe30TcAALqnpPbOYWrSlI/svi/ -- DID YOU KNOW you can conduct a more credible and powerful reference check using LinkedIn? Enter the company name and years of employment or the prospective employee to find their colleagues that are also in your network. This provides you with a more balanced set of feedback to evaluate that new hire. http://www.linkedin.com/e/rsr/inv-27/ -- (c) 2009, LinkedIn Corporation -- SLUG - Sydney Linux User's Group Mailing List - http://slug.org.au/ Subscription info and FAQs: http://slug.org.au/faq/mailinglists.html
