justaddwater.dk

For a project I’m working on, I had to change some files with personal settings, and the files kept showing up with a
git status
.
Adding files to .gitignore that are already tracked does not work. (and it’s actually pretty well documented in the documentation). In stead, it’s possible to use this command:
git update-index –assume-unchanged [filename(s)]
From [...]

Here is a short one-liner that really annoyed my colleagues today.
I set my mac to read aloud all changes in the repository since yesterday:

git log –pretty=format:”%an commit %s, %ad.” –date=relative –since=yesterday |say

if you remove the “say” command in the end it’s actually pretty readable:

pagerbak commit VA17, 34 minutes ago.
pagerbak commit VA17 – Not used, [...]

UPDATE 9 hours later: Changed to “remote = origin” to the specific branch “remote = dean” which works!
Short explanation on how to pull changes from different Git repositories into your local Git repository.
Last week I worked with three different Github forks of a project. Now for standard, when you clone a Github repository, the remote [...]

Many of my colleagues know svn but are in general not (yet) ready jump over to using Git for bigger projects.
Today I had to import my existing Git repository into SVN. I had been working locally with a Git repos and wanted to keep my history before giving access to my colleagues.
The guide from [...]

For the last months I have been using Git to work with my Subversion repositories. Besides from reducing disk usage, Git also makes my work slightly faster and independent of network access — I can make commits to repository which is sync’ed later when I get online.
One challenge though: Using branches
I ran into some pitfalls [...]

My problem this week: I wanted to share some work with a colleague. Unfortunately we have not yet setup our caplab environment with git server. Nor did i want to push this particular project to GitHub or Unfuddle. My alternative was a file-based setup:

Each developer’s machine has it’s own Git repository.
On my machine I had [...]

A side benefit of switching from Subversion to Git for source control is that Git does not use shadow files and directories to find out what has changed.
I created two checkouts of a svn project — one using traditional svn and one using git (which can actually clone a svn repos — see explanation below).

[~/my-projects] [...]