Jason Meridth

Jason Meridth

Home
About

The Lounge

Ads by The Lounge

Friends of Pablo

Passionate aboutThe best C# & VB.NET refactoring plugin for Visual

Pablo's Extended Family

News

In Memorium: Nelson Montalvo

Syndication

Personal Links

Archives

Sort by: Most Recent | Most Viewed | Most Commented

Gotcha with Gitosis and python-setuptools

Today I decided to upgrade my slicehost slice from Intrepid Ibex to Lucid Lynx (Intrepid → Jaunty → Karmic → Lucid). Yeah, yeah, I’m a little behind. Anyways, It upgraded just fine. However when I was trying to push code to my gitosis...

Published Thu, May 27 2010 12:58 AM by Jason Meridth

Filed under: git, gitosis
Gitosis and Gitweb - Part 3 - Gitweb

Gitosis and Gitweb – Part 1 Gitosis and Gitweb – Part 2 So we are setup, have a project, and have contributors via the first 2 parts. I know that we are all enamored by the UI of GitHub.com . I am. Unfortunately you can’t get private...

Published Thu, May 27 2010 12:45 AM by Jason Meridth

Filed under: git, gitosis, gitweb
Gitosis and Gitweb - Part 2 - Add Projects and Contributors

Gitosis and Gitweb – Part 1 So we are setup now thanks to Part 1. Gitosis repository contents If we issue the “find .” command locally inside the gitosis-admin directory we will see the following: We have the .git folder, a gitosis.conf...

Published Mon, May 24 2010 11:02 PM by Jason Meridth

Filed under: git, gitosis
Gitosis and Gitweb - Part 1 - Setup

I’ve had a number of people ask me where they should host their Git repositories. Of course, my default question back is, “Can the code be public or does it need to be private?”. Usually they say, “public”. Therefore, my...

Published Mon, May 24 2010 10:42 PM by Jason Meridth

Filed under: git, gitosis
My "Git Branching and Workflows" presentation at Austin Code Camp 2010

Thanks to Shawn Weisfeld for recording this presentation. Enjoy.

Published Mon, May 24 2010 9:40 AM by Jason Meridth

Filed under: git, presentation
Seeing which Git branch I'm on via my console prompt (__git_ps1)

I like knowing which Git branch I’m currently in. I use the git-ps1 function feature that comes with git-core. If you clone or download the git source: git://git.kernel.org/pub/scm/git/git.git There is a file in the contrib/completion folder called...

Published Sat, May 22 2010 10:55 PM by Jason Meridth

Filed under: git
OAuth

UPDATE: Fixed puts statements. should have been x.token, not x.key. I have gotten tired of twitterfeed not handling our RSS feed and tweeting our new posts. So have the other LosTechies members. I decided to finally learn OAuth so that I can write a script...

Published Mon, Apr 05 2010 12:25 AM by Jason Meridth

Filed under: oauth
"Pro Git" Cliff Notes

These are my notes from reading Scott Chacon’s Pro Git I highly suggest buying this book if you are serious about using the Git version control tool. pg 48 A branch in Git is simply a lightweight movable pointer pg 50 a special pointer called HEAD…is...

Published Mon, Apr 05 2010 12:17 AM by Jason Meridth

Filed under: git
LosTechies welcomes Scott Gillenwater

Due to Joe welcoming his new baby boy into the world recently, he's asked me to introduce you all to Scott Gillenwater, a new addition to our group. Scott works with both Joe and I at Rackspace where he is a Senior Automation Engineer. He has an insatiable...

Published Sat, Mar 27 2010 1:53 AM by Jason Meridth

Filed under: members
Git tracking branches

I have encountered this message multiple times when dealing with Git: ~/code/blog/armmer.github.com(master) $ git pull You asked me to pull without telling me which branch you want to merge with, and 'branch.master.merge' in your configuration file does...

Published Tue, Mar 23 2010 5:36 PM by Jason Meridth

Filed under: git
Git reset, checkout & "bare double dash", and revert

UPDATE : Please make sure to read Alexander's comments on git rebase --interactive UPDATE : If you need to unstage a file prior to your first commit: $ git rm --cached filename Thanks to Sean Chambers for tweeting about this Some of the common questions...

Published Tue, Mar 23 2010 5:29 PM by Jason Meridth

Filed under: git
Refspec matches more than one

I was trying to push to a canonical repository this morning and got the following error: $ git push origin master error: src refspec master matches more than one. error: failed to push some refs to 'ssh://user@host/srv/git/repo' This happened because...

Published Sat, Feb 27 2010 2:31 PM by Jason Meridth

Filed under: git
Git post-merge hook to auto-fire rails migrations

I saw Scott Bellware recently write on twitter: for christmas, i really want a git hook to detect if an update has changes in the db/migrations folder Cory Foy , Aaron Jensen , and myself all responded in turn. I think Cory and I were quickly searching...

Published Sat, Feb 27 2010 2:28 PM by Jason Meridth

Filed under: rails, git, migrations, rake
Git - Suspicious Patch Lines

DISCLAIMER : This is only relevant if you or someone contributing to your project are doing cross-platform development. If you are typically just developing on Windows, you should be able to keep the config options set to false. The Problem While trying...

Published Sat, Feb 27 2010 2:21 PM by Jason Meridth

Filed under: git
Pair Programming with Screen

I’ve decided, once again, to make the jump back to VIM full-time. It will help my bash-fu become stronger and also ensure that I can pair program with any other dev. TextMate is awesome for personal development, but using NERDTree ( example ) and...

Published Thu, Feb 04 2010 11:44 AM by Jason Meridth

Filed under: Pair Programming

1 2 3 4 5 Next > ... Last »

Jason Meridth

News

Syndication

Recent Posts

Tags

Personal Links

Archives

Gotcha with Gitosis and python-setuptools

Gitosis and Gitweb - Part 3 - Gitweb

Gitosis and Gitweb - Part 2 - Add Projects and Contributors

Gitosis and Gitweb - Part 1 - Setup

My "Git Branching and Workflows" presentation at Austin Code Camp 2010

Seeing which Git branch I'm on via my console prompt (__git_ps1)

OAuth

"Pro Git" Cliff Notes

LosTechies welcomes Scott Gillenwater

Git tracking branches

Git reset, checkout & "bare double dash", and revert

Refspec matches more than one

Git post-merge hook to auto-fire rails migrations

Git - Suspicious Patch Lines

Pair Programming with Screen