-
Archives
- March 2010
- February 2010
- January 2010
- December 2009
- November 2009
- October 2009
- September 2009
- August 2009
- July 2009
- June 2009
- May 2009
- April 2009
- March 2009
- February 2009
- January 2009
- December 2008
- November 2008
- October 2008
- September 2008
- August 2008
- July 2008
- June 2008
- May 2008
- April 2008
- March 2008
- February 2008
- January 2008
- December 2007
- November 2007
- October 2007
- September 2007
- August 2007
- July 2007
- June 2007
- May 2007
- April 2007
- March 2007
- February 2007
- January 2007
- December 2006
- November 2006
- October 2006
- September 2006
- August 2006
- July 2006
- June 2006
- May 2006
- April 2006
-
Meta
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
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:
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
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
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
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