Skip to main content

Git Repository Collaboration

I know there are tons of tutorials out there about how to use git, but I thought I'd share my experiences so far anyway. I've decided to switch from using SVN to Git for managing my personal projects and utility scripts. I have two main reasons for this:
  • I'm using Git at work now and would like to increase my experience with it as much as possible.
  • I want to have (at least) two, decentralized repositories that I can merge at will. I want one on my laptop and the other on my desktop.
Creating a Git repository is super easy.
$ mkdir src
$ cd src
$ git init

To import your existing code, simply copy it to your new directory (or run git init in your existing code directory) and then: 
$ git add .
$ git commit -a

All too easy. Now, the slightly trickier part is doing merging code between your various repositories. If you have sshd running on your hosts, you can do the merge over ssh. Here's what I did: 
laptop$ git remote add desktop ssh://desktop.host/home/damonkohler/src
laptop$ git branch -a

The git remote add command will add a new branch for each branch in the desktop repository. The branches will be named "desktop/master," etc. and can then be merged into the laptop repository like so: 
laptop$ git merge desktop/master

Simple. Sweet.
Labels:

Popular posts from this blog

Email Injection

Not so long ago, I ran a wiki called SecurePHP. On that wiki, there was one particular article about email injection that received a lot of attention. Naturally, with all the attention came lots of spam. As a result, I disabled editing of the wiki and content stagnated. Still, the email injection article remained popular. About a year later, the server that hosted SecurePHP died and I never had a chance to hook it all back up. I saved the article though and I'm reposting it now. It may be a bit old (I've been away from PHP for a long time), and I didn't write all of it, so feel free to leave comments about needed updates and corrections. Though this article focuses on PHP, it provides a lot of general information regarding email injection attacks. The PHP mail() Function There are a lot of ways to send anonymous emails, some use it to mass mail, some use it to spoof identity, and some (a few) use it to send email anonymously. Usually a web mailform using the mail() funct
Read more

XBee ZNet 2.5 Wireless Accelerometer

I managed to put together a wireless accelerometer the other night using my two new XBees, an Arduino XBee shield, an XBee Explorer USB, an ADXL330, and some Python. I struggled a bit with some of it, so here's what I learned: First, a parts list. XBee 2mW Series 2.5 Chip Antenna Arduino XBee (with XBee Series 2.5 module) XBee Explorer USB ADXL330 I'm not sure exactly what the specs are on the XBee that comes with the Arduino shield. But, it is definitely a series 2.5. The first thing to do is to configure and upgrade the firmware on your XBees. To do that, you'll need X-CTU (for the firmware upgrade at least, but it's also nice for configuration) which, unfortunately, is only available for Windows. But, it works fine from VMware. First up, the XBee we'll hook up to the computer to read incoming data from the accelerometer: Plug one of the XBees into the Explorer (it's also possible to do this from the Arduino shield by shifting the two XBee/USB jumpers to USB
Read more

MJPEG Streaming Protocol

MJPEG is a popular format for webcam streams. It's probably popular because it's so simple to do and the performance is surprisingly good. Unfortunately, I found it quite difficult to scrape together enough information to implement a streamer myself. In an effort to help the next poor, frustrated soul, here's a simple method for streaming an MJPEG to a socket in Java. public void handleConnection(Socket socket, JpegProvider jpegProvider) throws Exception { byte[] data = jpegProvider.getJpeg(); OutputStream outputStream = socket.getOutputStream(); outputStream.write(( "HTTP/1.0 200 OK\r\n" + "Server: YourServerName\r\n" + "Connection: close\r\n" + "Max-Age: 0\r\n" + "Expires: 0\r\n" + "Cache-Control: no-cache, private\r\n" + "Pragma: no-cache\r\n" + "Content-Type: multipart/x-mixed-replace; " + "boundary=--BoundaryString\r\n\r\n&
Read more