I blog here occasionally. I hope you like it.
I'm the founder of Planypus, the place to share your plans!
Accessible, manageable, virtualized application stacks ready to download or deploy to the cloud!
Reach me at yan at pritzker.ws
In my previous post I discussed how it was possible to merge individual changes from one branch to another. At that time I mentioned using the log on the original branch to figure out which changes were available to merge, but it turns out there’s an easier way.
Let’s say you made some changes in local-trunk [...]
After several weeks of git usage, I’ve developed a nice workflow. First, we’ll start with working with several svn branches via git.
Working with svn branches via git
Assuming you’ve properly cloned your svn repository, you should have your trunk and remote branches fetched from svn. You can see the remote branches via
git branch -r
If you [...]
Here are a couple more fun git commands and configuration tricks.
Make some aliases because typing ‘checkout’ is a pain. In ~/.gitconfig:
Note the quicklog command below uses a custom log format which shows you a short hash, a relative date (”4 hours ago”) and the commit message. I created it by reading the git log formatting [...]
Things I’ve learned from my first git experiences. First of all, git is inconsistent as hell. Every command has its own quirks and syntax, so I’m attempting to catalog some of them here. We’ve been using git svn at Planypus as a way to maintain local developer branches and still push to our svn as [...]
Rails has officially moved to GitHub. The GitHub guys have done an awesome job capitalizing on the growing trend of git usage, especially in the Rails community, and of course getting ‘official blessing’ from the Rails core team themselves means that many more projects are sure to follow.
I’ve been using git-svn to work on a [...]
© skwpspace. Powered by WordPress using a DePo Clean Theme modified by Yan Pritzker.