Git Screencast
[ link: ogre-git-screencast | tags: git talk video | updated: Sun, 13 Jul 2008 19:52:19 ]
Ian Ward posted a screencast of my Git intro talk. Thanks Richard for doing the audio, Ian for doing the screencast and post production, and Jay for hosting us.
Introducing the Ottawa Ruby folks to Git
[ link: ogre-git-intro | tags: git ogre talk | updated: Wed, 02 Jul 2008 11:41:53 ]
I am giving another git talk for The Ottawa Group of Ruby Enthusiasts!.
The talk is on July 9th at 7:00 PM, at Infonium. I was told that they have room for 20 people.
I will post my slides after the talk.
show more git info on zsh prompt
[ link: zsh-git-prompt | tags: git zsh shell | updated: Fri, 09 May 2008 14:26:56 ]
This is my third post on the topic. I have harshly assimulated MadCoder's configuration. Here is my new zsh prompt:
git-vim
[ link: git-vim | tags: git vim | updated: Wed, 30 Apr 2008 10:44:36 ]
I have had an item on my todo list to improve my vim/git integration for a while. Today, I found git-vim on github. I was really impressed. So I forked it and hope to do some work on the project...
git://tachyon.jukie.net/git-vim.git
First I will have to check if there is anything salvageable from my current vim scripts.
color your word
[ link: color-your-word | tags: git | updated: Sat, 12 Apr 2008 10:27:39 ]
I just discovered a git feature that has eluded me since v1.4.3, when it was
introduced. It's a way to colour differing words in git diff output. Maybe you don't
know about it either... allow me demonstrate:
show current git branch on zsh prompt (2)
[ link: zsh-git-branch2 | tags: git zsh shell | updated: Sat, 10 May 2008 08:25:24 ]
NOTE: This post has been updated (again).
I previously wrote about showing the git branch name on the zsh prompt. Caio Marcelo pointed out that
it didn't work very well because the git branch was being queried before the command was executed, and it should
be after to catch git commands that change the branch, like git branch and git checkout.
He was right, here is a repost.
how to track multiple svn branches in git
[ link: svn-branches-in-git | tags: git svn scm | updated: Mon, 03 Mar 2008 21:27:21 ]
I must say that I am no fan SVN, but SVN and I get a long a lot better since I started using git-svn. Long ago a good friend of mine, Dave O'Neill, taught me how to handle multiple branches using git-svn. I had used that technique until Dave taught me how to do it better.
Recently I saw this blog post which referenced Dave's article talking about the first method. I guess Dave never got around to updating his blog with the better way. So I am going to do that here:
show current git branch in zsh
[ link: zsh-git-branch | tags: git zsh shell | updated: Fri, 04 Apr 2008 11:26:24 ]
NOTE: This post has been updated.
Earlier today I saw a blog post titled "Git in your prompt"
which showed how to get the current git branch to display in zsh and bash. I tried it on my setup and found it really slow, probably due
having $HOME on NFS or having big git repos or maybe not enough ram.
Anyway, after looking at some zsh docs and blog posts, I had
added caching to the idea. Now the git-branch is only queried on a directory change or on a command that matches *git*.
git-rebase --interactive
[ link: git-rebase-interactive | tags: git scm | updated: Sun, 09 Sep 2007 20:43:19 ]
MadCoder wrote today about git-rebase --interactive which is a new feature in git that allows you to easily reorder, or fix patches already applied to the current branch by editing a file... very neat.
svn status like output in git
[ link: parsing-git-status | tags: git | updated: Fri, 31 Aug 2007 14:35:30 ]
Today Dave asked me how to get a script-friendly list of untracked files,
and modified files... like svn status.
First I suggested that he look at --diff-filter and --name-status options for git-diff.
git diff --name-status --diff-filter=M
While git-diff can actually report a lot of cool stuff (see the git-diff-files man page for
more details), it did not solve all the problems. The above worked for getting the list of
modified files, but not for untracked files. We scratched our heads and were unable to get anywhere.
Then Dave found git-ls-files... a primitive I probably have not ran since 2005. Well it turn out
that if you need to use things that git-status reports on in a script, you really want to
run git-ls-files.
git ls-files --exclude-per-directory=.gitignore --exclude-from=.git/info/exclude \
--others \
--modified \
-t
Again, see the man page for git-ls-files for more details.