Bart's Blog

I am experimenting with a new workflow to help solve the problem of lost work between commits. As described in my previous post, there are already several ways to deal with keeping track of frequent edits. The only problem is that they all involve dedication and extra effort.

[Read More]

using git workflows to avoid loosing intermediate changes

[ link: 20091104194146 | tags: git | updated: Fri, 15 Jan 2010 22:27:56 ]

A few days ago a buddy, Jean, had stumbled into a problem caused by infrequent committing to his git repository. Committing after the feature is implemented is common when working with tools like SVN... but we have multiple workflows available to us under git to manage frequent commits.

[Read More]

pimping out git log

[ link: pimping-out-git-log | tags: git | updated: Fri, 15 Jan 2010 22:27:56 ]

I got playing with git log and ended up creating this alias:

[alias]
    lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative

Which adds a git lg command that is a prettier version of git log --oneline.

[Read More]

importing an old project into git

[ link: 20090714094340 | tags: git | updated: Fri, 15 Jan 2010 22:27:56 ]

I have recently been asked to revive an old project. Way back when I used to use bk for tracking changes. But today, I don't even have a working bk tree.

Moving the history to git is easiest done by taking the tarballs I've published and creating a commit per tarball.

Below is a simple script that will do just that.

[Read More]

Why pick Git?

[ link: why-pick-git | tags: git | updated: Fri, 15 Jan 2010 22:27:56 ]

Someone on the Git LinkedIn group asked "why pick Git?". I started writing a response on LinkedIn but quickly realized I had more to say on the topic than I'd care to leave behind closed doors of LinkedIn.

If you already use Git, none of the stuff I talk about below will surprise you. But if this sparks your interest see my Git talk.

[Read More]

bringing git-format-patch to bzr

[ link: 20090622214023 | tags: git bzr | updated: Fri, 15 Jan 2010 22:27:56 ]

It should be of no surprise to readers of this blog that I am a fan of Git. If you know me, you will also know that I am no fan of Bzr.

I was working on something today and wanted to export a patch... you know, like git format-patch does. Well, bzr does not seem to have an equivalent.

[Read More]

Scott Chacon smacks git around

[ link: 20090610202041 | tags: git | updated: Fri, 15 Jan 2010 22:27:56 ]

I came across a RailsConf talk given by Scott Chacon last month. As previously, his git work is really good. His presentation style has also guided my Git the basics talk which I gave about a year ago.

Anyway, I want to summarize what I learned from Scott's presentation...

[Read More]

git-vim hacking

[ link: 20090608010405 | tags: git vim vimgit | updated: Fri, 15 Jan 2010 22:27:56 ]

I did some hacking on my fork on git-vim. I am impressed how well things work. motemen, the upstream author, did a really great job setting things up.

I've been mostly tyoing with command handling and completion this evening. I want to make that I could type :git diff ma<tab> and have it do the rigth thing... it seems to work.

Next, I need to integrate my other git hacks and also others that seem interesting. I should also see if I can get the upstream author to consider including any of it.

splitting files out of a commit

[ link: 20090501172645 | tags: git scm | updated: Fri, 15 Jan 2010 22:27:56 ]

I previously wrote on splitting patches with git. This is very similar but deals with removing a file from a commit.

[Read More]

how old are these files in git?

[ link: git-file-blame | tags: git | updated: Fri, 15 Jan 2010 22:27:56 ]

A freind asked me how he could check the age of a file in his git repository. I came up with this:

    % git ls-files | xargs -n1 -i{} git log -1 --pretty=format:"%ci {}" -- {}
    2007-04-11 11:39:31 -0400 .gitignore
    2008-10-18 10:52:27 -0400 Xdefaults
    ...

It walks through all the files tracked by git and prints the time stamp of the last commit that modified that file.

Git rocks!

Bart's Blog

Now viewing: /tag/git

About

Tags

Posts

using WIP branches to save every edit

[ link: save-everything-with-git-wip | tags: git vim | updated: Fri, 15 Jan 2010 22:27:56 ]

using git workflows to avoid loosing intermediate changes

[ link: 20091104194146 | tags: git | updated: Fri, 15 Jan 2010 22:27:56 ]

pimping out git log

[ link: pimping-out-git-log | tags: git | updated: Fri, 15 Jan 2010 22:27:56 ]

importing an old project into git

[ link: 20090714094340 | tags: git | updated: Fri, 15 Jan 2010 22:27:56 ]

Why pick Git?

[ link: why-pick-git | tags: git | updated: Fri, 15 Jan 2010 22:27:56 ]

bringing git-format-patch to bzr

[ link: 20090622214023 | tags: git bzr | updated: Fri, 15 Jan 2010 22:27:56 ]

Scott Chacon smacks git around

[ link: 20090610202041 | tags: git | updated: Fri, 15 Jan 2010 22:27:56 ]

git-vim hacking

[ link: 20090608010405 | tags: git vim vimgit | updated: Fri, 15 Jan 2010 22:27:56 ]

splitting files out of a commit

[ link: 20090501172645 | tags: git scm | updated: Fri, 15 Jan 2010 22:27:56 ]

how old are these files in git?

[ link: git-file-blame | tags: git | updated: Fri, 15 Jan 2010 22:27:56 ]