Tag Archives: git

Using MacVim as your git mergetool

Install MacVim and the command line tool, mvim. Then in your ~/.gitconfig add this, thusly (replacing the path to mvim with the correct one): [merge] tool = mvim[mergetool “mvim”] cmd=/Users/tjweir/bin/mvim -d -g $LOCAL $MERGED $REMOTE keepbackup=false Then you can “git … Continue reading

Posted in Uncategorized | Tagged , , , | Leave a comment

MacVim and Git together at last. I tw…

MacVim and Git together at last. I tweeted awhile ago and got no response, so I figured I’d take the time to do it myself. To use MacVim as your git mergetool, add this to ~/.gitconfig:

Posted in Uncategorized | Tagged , , | Leave a comment

To Remember: git reset –hard HEAD

Since I can’t seem to remember the git command to throw away any goofy changes and revert to HEAD, I’ll post it here: git reset –hard HEAD This is more like svn revert (don’t use git revert HEAD, it won’t … Continue reading

Posted in General | Tagged | Comments Off

My .gitignore file

Stolen from http://github.com/dpp/liftweb/tree/master/.gitignore (master) $ cat .gitignore # use glob syntax. syntax: glob *.ser *.class *~ *.bak *.off *.old .DS_Store # logs derby.log #derby db lift_example # eclipse conf file #.settings #.classpath #.project .manager # building target build null tmp* … Continue reading

Posted in General | Tagged , | Comments Off

Keeping a git fork in sync with the forked repo.

I forked http://github.com/dpp/lift/tree/master to http://github.com/tjweir/lift/tree/master and I want to keep in sync with the update to dpp/lift. This is how I do it. In my repo add a remote reference to dpp/lift: $ git remote add dppmaster git://github.com/dpp/lift.git Fetch $ … Continue reading

Posted in General | Tagged , | Comments Off

SVNRepository.com adds git hosting.

I use SVNRepository.com for my Subversion hosting. Today I decided to move a repo from Beanstalk and found out that they offer git hosting now. Oh, look, a Crash Course on Git for SVN users. I added a quick web … Continue reading

Posted in General | Tagged , , | Comments Off