background preloader


Facebook Twitter

Git Reference. So far we have been committing snapshots of your project and switching between different isolated contexts, but what if we've forgotten how we've got to where we are?

Git Reference

Or what if we want to know how one branch differs from another? Git provides a tool that shows you all the commit messages that have lead up to the snapshot you are currently on, which is called git log. To understand the log command, you have to understand what information is stored when you run the git commit command to store a snapshot. In addition to the manifest of files and commit message and information about the person who committed it, Git also stores the commit that you based this snapshot on. Tutorial: Secure Git And Jira Integration (5/7) This article is part of a series about the complete installation of the Atlassian collaborative software suite behind a proxy with SSL everywhere.

Tutorial: Secure Git And Jira Integration (5/7)

If you want to understand the goal of this tutorial, you should report to the introduction article. From there, you would also have access to the installation of the basis of the Atlassian applications with Crowd, Confluence, and Jira. Mercurial and Git GUI for Mac OS X. Converting a Subversion repository to Git, (7 steps to migrate a complete mirror of svn in git) When I first realized that I needed a version control system, the best system at the time was CVS.

Converting a Subversion repository to Git, (7 steps to migrate a complete mirror of svn in git)

(No, really.) Subversion was nearing 1.0, so I waited for its release and then used it everywhere. Well, that was 2003. Time for a change. Git Reference. Git reset is probably the most confusing command written by humans, but it can be very useful once you get the hang of it.

Git Reference

There are three specific invocations of it that are generally helpful. git reset HEAD unstage files from index and reset pointer to HEAD First, you can use it to unstage something that has been accidentally staged. Let's say that you have modified two files and want to record them into two different commits. You should stage and commit one, then stage and commit the other. Parallel Development Strategies for Software Configuration Management. Click here to view the complete list of archived articles This article was originally published in the Summer 2004 issue of Methods & Tools Parallel Development Strategies for Software Configuration Management Tom Bret, Confluence Systems Ltd, in association with MKS Inc ( Abstract Software project managers routinely face the challenge of developing parallel configurations of software assets.

Parallel Development Strategies for Software Configuration Management

This article describes business situations where parallel development is necessary and examines strategies forconfiguration management in each situation. What is Parallel Development? Many software projects, especially in their early stages, follow a strictly linear development progression in which eachsuccessive version of the software is derived from, and increments, the previousversion. Your Dashboard - GitHub. Sitaramc/gitolite - GitHub. Distributed Parallel Development with JIRA and Plastic SCM - Atlassian TV. Scaling Puppet with Git. Scaling Puppet with Git More and more people are turning to systems automation tools like Puppet and Chef to get the most out of their environments, and to create time to focus on delivering business benefits.

Scaling Puppet with Git

Scaling Puppet is most commonly done using client/server mode, in which every client is issued with an SSL certificate, and conversations take place between clients and a server, over HTTP, and manifests and assets are served over the network, and applied by a locally running Puppet daemon. However, is there a better way? A Git Primer. Git is a wicked-powerful distributed revision control system.

A Git Primer

It is confusing to many, so there are myriad tutorials and explanations online to help people understand it. This one will focus on the fundamental concepts and tasks rather than trying to compete with the documentation. “I’m an egotistical bastard, and I name all my projects after myself. First Linux, now git.” ~ Linus Torvalds Definitions Working Directory. Tower - The most powerful Git client for Mac. A successful Git branching model » In this post I present the development model that I’ve introduced for all of my projects (both at work and private) about a year ago, and which has turned out to be very successful.

A successful Git branching model »

I’ve been meaning to write about it for a while now, but I’ve never really found the time to do so thoroughly, until now. I won’t talk about any of the projects’ details, merely about the branching strategy and release management. It focuses around Git as the tool for the versioning of all of our source code. Multi-QA Environment, parallel development with Git. Git success story in parallel development. RSS Feed ~ Comment: by email - on Twitter ~ Share: Twitter - Facebook - Linked In - Google+ - Permanent link The time pass but my enthusiasm for Git continues to glow!

Git success story in parallel development

Actually, it seams that I am not the only one to enjoy Git as surprisingly my last article on Git became the most read post (if I can rely on my website statistic...) before a lot of OpenGL articles as it can be expected. One great tool with Git is Gitk. I was using it on the OpenGL Samples Pack and suddenly I was amazed by the graph Gitk gave me: A demonstration of the effectiveness of a development process based on Git! With Git, it's so easy to work on different things, on different version... in parallel! The yellow labels are tags that I use as releases markers and the green labels are branches. With the OpenGL Samples Pack the graph is quite complex relatively to the project size. Gitk --all on the OpenGL Samples Pack repository.