Git on Shallow and Pedantic

Seaplane - Github with a non-programmer

lutzky@gmail.com (Ohad Lutzky) — Sat, 30 May 2015 00:00:00 +0000

When I helped a non-programmer friend with some code for psychology research, and how we avoided using Matlab.

Git While You Sit 3 - "Rename" edge cases

lutzky@gmail.com (Ohad Lutzky) — Sun, 17 Aug 2014 00:00:00 +0000

Sometimes, git does something unexpected while merging or rebasing. It might seem like git misunderstood a rename, but it’s far more likely that git did the “right” thing after all.

Git While You Sit 2 - .gitignore

lutzky@gmail.com (Ohad Lutzky) — Fri, 15 Aug 2014 00:00:00 +0000

Using .gitignore to exclude build artifacts from your repository.

Git While You Sit 1 - Add --patch

lutzky@gmail.com (Ohad Lutzky) — Wed, 13 Aug 2014 00:00:00 +0000

Using git add -p to eliminate those pesky printf-debugging statements.

Using git for code review

lutzky@gmail.com (Ohad Lutzky) — Sat, 04 Apr 2009 12:23:00 +0000

At my workplace, I’ve recently been using git for code review purposes. I work on code in my own git clone, and ask a peer to review it. It works somewhat like this:

master branch is same code as currently in upstream.
Working to resolve issue #1234 pertaining to “Performance for gizmo”, I work on a branch 1234-gizmo-performance.
I mail a peer, John, with this information, as well as my repository location.
John adds my repository as a remote, lutzky. Then he branches review1 (or review2 if that is taken, and so on) at lutzky/1234-gizmo-performance.
John adds comments with nice big FIXME tags, which are highlighted in any decent editor. He commits this, the commit-message stating that it was code review.
John tags his final review commit (or, if he had no comments - lutzky/1234-gizmo-performance) with a reviewed1 (or reviewed2, etc.) annotated tag. Since the annotated tag includes all the necessary information (who tagged, when, and what), the number doesn’t really matter.
I merge john/review1, incorporate the changes (or reject them) and remove the comments. If no further review is necessary, I submit this - and once submitted, I merge this back into master.

It’s a nice system. I wonder what other methods there are of doing this.

Things I learned today

lutzky@gmail.com (Ohad Lutzky) — Mon, 28 Apr 2008 21:10:00 +0000

You can use git on a VFAT disk (for example, a USB key) without all of the annoying mode issues, by using the following setting in .git/config:
1 2

[core] filemode = false
What I haven’t figured out is how to do force a chmod in this situation; for example, if I create a new script, I was hoping to be able to git chmod +x it.
Cream is a very good editor if you’re used to Windows applications. It’s a set of plugins for VIM which make it modeless and (very) familiar to Windows users. However, Ctrl-O still has its usual job for us ordinary junkies :)

Really liking this git thing

lutzky@gmail.com (Ohad Lutzky) — Tue, 18 Sep 2007 11:27:00 +0000

I’ve been a very big proponent of Subversion so far, especially as a tool for collaborating on coding homework. However, I’ve recently been trying out Linus’s git. It’s very nice so far, and really seems to be catching on. Some good points:

Fast as all hell (much faster than Bazaar, although I haven’t given that the proper attention)
No need for a central server; hell, no need for an internet connection at all, everything can be done over USB keys or whatnot
No real need to configure any special server; just install git on it
Very nice alternative to configuring write-control for all of the users
Very easy branching and merging, finally! SVN really shows its weakness here

One thing I couldn’t find out how to do is limiting read-access to git repositories without special server configuration. It would be nice if git had support for .htpasswd-compatible authentication, those are pretty easy to use.