Skip navigation

teranex weblog

top menu

article

git Submodules Explained « Mark’s Blog

Submodules in git are commonly misunderstood in various ways, and although the explanation in the official manual is clear and pretty easy to understand, I thought that a different treatment here might be useful to someone.

http://longair.net/blog/2010/06/02/git-submodules-explained/

git: fetch and merge, don’t pull « Mark’s Blog

The problem with git pull is that it has all kinds of helpful magic that means you don’t really have to learn about the different types of branch in git. Mostly things Just Work, but when they don’t it’s often difficult to work out why. What seem like obvious bits of syntax for git pull may have rather surprising results, as even a cursory look through the manual page should convince you.

http://longair.net/blog/2009/04/16/git-fetch-and-merge/

nothingmuch's perl blog: git rebase Considered Awesome

git rebase is subject to quite a few controversial opinions, but in all my experience working with Git it seems that most people who use Git, even those who use rebase, myself included, often don't really know exactly what it does. Apparently, many people are afraid of using it because it does evil magic like changing the past and eating babies. The truth is that git rebase actually does so much more!

http://blog.woobling.org/2009/05/git-rebase-considered-awesome.html

How to NetBoot and NetInstall Ubuntu

Normally when you want to install a new operating system on a computer, you either burn a CD or use a USB key with the installer for that operating system and make the computer boot from that media. There's another device you can boot your computer from: the network card.

http://my.opera.com/ilogico/blog/how-to-netboot-and-netinstall-ubuntu

Make your own lifestream with open source Storytlr

The arrival of a new year is often viewed as an opportunity for self improvement. According the US government, some of the population's top new year's resolutions for 2010 include plans to lose weight, improve finances, and reduce stress. I imagine that our audience of super-geeks have a few goals that aren't on the list. This year, I decided to finally fix up my personal Web site. An open source lifestream framework called Storytlr made my goal easy to accomplish.

http://arstechnica.com/open-source/guides/2010/01/make-your-own-lifestream-with-open-source-software.ars?utm_source=rss&utm_medium=rss&utm_campaign=rss

Linux is NOT Windows

If you've been pointed at this page, then the chances are you're a relatively new Linux user who's having some problems making the switch from Windows to Linux. This causes many problems for many people, hence this article was written. Many individual issues arise from this single problem, so the page is broken down into multiple problem areas.

http://linux.oneandoneis2.org/LNW.htm

How to Write Your Own IM Bot in Less Than 5 Minutes

This quick tutorial will show you how to develop your own functional IM bot that works with Google Talk, Yahoo! Messenger, Windows Live and all other popular instant messaging clients.

http://www.labnol.org/internet/tutorial-create-bot-for-gtalk-yahoo-messenger/4354/

Backups on non-trusted FTP servers - heise Security UK

Anyone storing data on an unfamiliar FTP server needs to encrypt and sign it to ensure reliable protection against prying eyes and external manipulation. duplicity is just the tool for this, and the ftplicity script from c't magazine makes working with it child's play.

http://www.heise-online.co.uk/security/Backups-on-non-trusted-FTP-servers--/features/79882

Chistory

The C programming language was devised in the early 1970s as a system implementation language for the nascent Unix operating system. Derived from the typeless language BCPL, it evolved a type structure; created on a tiny machine as a tool to improve a mea

http://www.cs.bell-labs.com/who/dmr/chist.html