Stories, software and strategies to help nonprofits do the social web
via nvie.com. Great post on real-world branching conventions for Git, including when to create branches for development, and when to merge them. The comments have some great tips about when to use...
June, 23 2010 • 0 Comments • 0 Faves
When you do a rebase, it saves all commits in the current branch that are not available in the upstream branch to a staging area, and reset the current branch to upstream branch. Then those saved commits would be reapplied on top of the current branch, one by one. With this process, it ensures my newest changes would remain as the newest. The new workflow with rebasing would be: 1 git pull origin master 2 git checkout -b new-feature-branch 3 git status 4 git commit -am "commit message" 5 6 ...
June, 5 2010 • 0 Comments • 0 Faves
No more firewall problems using GitHub. Yay! Git supports a new, much more efficient HTTP based transport as of version 1.6.6. Well, now GitHub supports that new protocol as well. From now on, if you clone a repository over the http:// url and you are using a Git client version 1.6.6 or greater, Git will automatically use the newer, better transport mechanism. Even more amazing, however, is that you can now push over that protocol and clone private repositories as well. If you access a private repository...
May, 3 2010 • 0 Comments • 0 Faves
Git is a great (and fashionable) source control management program. GitHub takes the pain out of hosting Git for a group — for both open-source and private projects. How to best use them together? The Way to Happiness has these 4 steps: Fork the project on GitHub, and clone your version. This gives you your own copy to work with. Make a branch (or frequent branches) for what you’re working on. Some folks systematize this with issue names and bug numbers — like “RedoPostFormatting-234” — which is probably a good...
November, 29 2008 • 0 Comments • 0 Faves
The folks at GitHub have taken the pain out of centralized Git hosting. Even better, they’ve built in tools that make distributed version control easy to use for group projects. But how to set up your repositories and branches to avoid merge pain? Here are two good options. Making Merge Manageable Setting up your Git repositories for open source projects at github has great tips for getting started — and for structuring your branches for group work. There are a couple of take-aways here: Encourage contributors...
October, 29 2008 • 0 Comments • 0 Faves
So you want to use Git for distributed version control. For Mac OS X 10.5 there are a couple of options for installing Git. Fink packages an almost up-to-date version, named simply git MacPorts packages an up-to-date version asgit-core Either of these methods, though, installs lots of dependencies. Which requires lots of compile time. And lots of disk space — especially for the MacPorts version. So I prefer to compile Git myself — and use Fink for dependencies. Here’s how I do it. Install Fink by following Fink’s...
April, 4 2008 • 0 Comments • 0 Faves
So you want to use Git the latest hotness in distributed version control. It builds easily using the instructions in the INSTALL file. But on Centos 5 (or Red Hat Enterprise Linux 5) there are some dependencies to install first: sudo apt-get install gettext-devel expat-devel curl-devel zlib-devel openssl-devel From here the instructions in Git’s INSTALL file work just fine: wget http://kernel.org/pub/software/scm/git/git-1.5.4.5.tar.gz tar zxvf git-1.5.4.5.tar.gz cd git-1.5.4.5 make prefix=/usr/local all...
April, 3 2008 • 0 Comments • 0 Faves
Startup thinking for the social sector. Code to help nonprofits do the social web. Plus photography.
(And reading aloud.)
More about Eric Johnson.
Theme created for Posterous by Obox
