django-reversion - Google Code
http://code.google.com/p/django-reversion/

"Version control for Django models"

Reversion is an extension to the Django web framework that provides comprehensive version control facilities.

Revision control for Django models. Might be useful for those times when I forget/neglect to add to SVN.

by Glen Stansberry Subversion is a version control system that many Web developers and designers use to back up their work. Subversion was started in 2000 and is quite popular in the open-source community; major

Unless you’re a one person web shop with no team to collaborate with, you’ve experienced the frustration that goes along with file sharing. No matter how hard you try, when multiple people are working on a single project without a version control system in place things get chaotic.

How to recover your project if git hub goes down.

Thanks! I am going to cancel my github account so this will be useful

git instaweb --httpd=webrick FTW.

At Hashrocket we use git both internally and in our Agile mentoring and training. Git gives us the flexibility to design a version control workflow that meets the needs of either a fully Agile team or a team that is transitioning towards an Agile process.

git config alias.datetag '!git tag `date "+%Y%m%d%H%M"`'

a really really great way to use git from emacs

It's Magit! A Emacs mode for Git.

Git mode for emacs

how to use git as version control for writers

nice intro to Flashbake

Save snapshots of frequently-updated files over time with programmer-strength version control—but without the learning curve. Free software Flashbake captures working files and adds details like the weather and your Twitter status to each version automatically.

"Git submodules are implemented using two moving parts: the .gitmodules file and a special kind of tree object. These together triangulate a specific revision of a specific repository which is checked out into a specific location in your project."

Fraser Speirs explains the difference between good old svn:externals and git submodules.

overview of git features

http://www.ralfebert.de/blog/tools/visual_git_tutorial_1/

Extremely well written!

st on the Pro Git book website, which contains the full content of the book published by Apress and a blog for me to share Git tips and book news with everybody.

hgsubversion installation guide

to rebase or to merge, that is the question.

intro to rebase

Rebase helps to cut up commits and slice them into any way that you want them served up, and placed exactly where you want them. You can actually rewrite history with this command, be it reordering commits, squashing them into bigger ones, or completely ignoring them if you so desire.

This article introduces version control and Git without assuming you have any prior knowledge or programming experience. Because of its introductory nature, certain details are simplified or omitted and the use of the Git Graphical User Interface (Git GUI) is emphasized. Version control is the process of recording the history of changes to files as they are modified. Users can go back in time and get old versions and identify where changes were introduced (people sometimes refer to version control tools as time machines). This means that it’s easier to: * protect against changes—accidental or otherwise—and be able to access a known good version of a file * track down problems and make fixes to previous versions of files * allow more than one person to modify project files simultaneously (programmers refer to this as parallel development) * retrieve an older set of files (if requested by a customer or manager, for example)

Good advice on branches for web development (production, release, maintenance, etc).

How to set upand use GIT

introduction intro to git

This article introduces version control and Git without assuming you have any prior knowledge or programming experience. Because of its introductory nature, certain details are simplified or omitted and the use of the Git Graphical User Interface (Git GUI) is emphasized. Afterwards the reader should be able to use Git for basic version control and know where to locate further information.

Don’t rebase branches you have shared with another developer - they will hate you and you will hate yourself.

I want to share with you the concept that you can think about version control not as a neccesary inconvenience that you need to put up with in order to collaborate, but rather as a powerful framework for managing your work seperately in contexts, for being able to switch and merge between those contexts quickly and easily, for being able to make decisions late and craft your work without having to pre-plan everything all the time. Git makes all of these things easy and prioritizes them and should change the way you think about how to approach a problem in any of your projects and version control itself.

ThinkVitamin - Carsonified's blog about the web

Quick, clear, simple guide to the way Mercurial handles branching.

Nifty program that visualizes changes made in a Git repository over time.

Gource is a software version control visualization for Git and CVS.

Git is pretty easy to get: on a Mac, it’s probably easiest to use the git-osx-installer. If you have MacPorts installed, you may want to get Git through it; you can find instructions on the GitHub help site. (And yes, we’ll talk about GitHub). On Windows, the simplest way to start rolling is to use the msysgit installer. However, if you’ve got Cygwin, you can git Git through there as w

Have you ever worked on a project that was so unwieldy, you were scared to update a file or add a feature? Maybe the problem was that you weren't using a

Inspiration for API for versioning XBRL instance document

Très joli git log --graph à consommer sans modération

You can run the following to add it to your ~/.gitconfig: git config --global alias.lg "log --graph --pretty=format:'%Cred%h%Creset

I love this custom log view for git

Version control (compatible with Mercurial) written in Ruby.

Mercurial ported to Ruby with very easy customization.

Amp is unlike any other VCS software to date. Amp's novel command system gives you the flexibility to customize and personalize the way you develop software. Create in your own workspace with full Mercurial compatibility, and no external dependencies.

Weiteres UI für Git. Siehe GitX

The GitTorrent Protocol (GTP) is a protocol for collaborative git repository distribution across the Internet.

It might currently come across as a solution looking for a problem - and as one smart-ass with admin rights to the Google Code project reminds you on the source tab, "more alpha than the greek letter". The initial motivation was performance of downloads and in particular reducing load on kernel.org.

This could be interesting.

Using Git to Maintain Your Website | danielmiessler.com

Simple SVN introduction tutorial.

Instead of contributing to the mass of tutorials already written about the subject, I figured I would take the easy useful way out and compose a list of great tutorials on how to accomplish a migration to Git for those who are familiar with SVN. If you have more links, please comment away and I’ll add them in.

Some tutorials and other resources related to migrating from SVN to Git

links on how to use git and svn together

About composing commits and writing commit log messages.

An opinion piece on what comprises a good commit message.

Any software project is a collaborative project. It has at least two developers, the original developer and the original developer a few weeks or months later when the train of thought has long left the station. This later self needs to reestablish the context of a particular piece of code each time a new bug occurs or a new feature needs to be implemented.

"In the last few weeks, I've had a surprising number of discussions about commit messages. Many of them were with developers new to a project, trying to get them started. So here's a list of things you should do when committing, and why you should do it."

An excellent list of best-practices for commit messages when using your favourite version control system.

good reasoning on howto, and hwo not to write commit messages

moving master with --no-ff

dialy

A well described branching model for git

▍ ★∴ 　　　．．．．▍▍．..．█▍ ☆ ★∵ ..../ 　　　◥█▅▅██▅▅██▅▅▅▅▅███◤ 　　　．◥███████████████◤ 　～～～～◥█████████████◤～～～～ www.nikes-jordan.com , instant online Paypal payment! TT Assuring good quality, Coupons and feebies! Don't miss out! Jordan，AF1，Nike , RunningShoes, Sneakers, Dunks $40 Brand Jeans: $ 38 Brand sunglasses, $18 Brand Caps/Hats: $ 18 Brand Belts: $ 28 UGG boots：$ 55 Free Shipping, Retail and wholesale! Payment options: Paypal , TT, Westunion www.nikes-jordan.com

I still run into people lambasting git for the concept of the index from time to time. It seems strange and superfluous to users of other VCSs – like a speed bump that serves no purpose. Why not just commit the changes in the working copy? This perception is understandable; when I first heard of git, back as a Subversion user, I was one of these people. How times and minds change. Today, I use it and rely on it so much that I can’t imagine moving to any other VCS that doesn’t have this concept. (And none of the contemporary contenders do.) Because of this, I keep responding to such criticism, repeating myself. I figured I should put my explanation down somewhere where I can point people to.

Pretty decent intro to mercurial, clear and well written. Does dabble a bit on differences to svn as well.

by @martinfowler

find differences in PSD files by comparing Photoshop PSD files layer-by-layer

ComparePSD is a free Windows software that helps finding the differences between 2 PSD files in such situations to save you time. The software enables you to select the files to be compared from Windows Explorer. When it is started, the files are compared layer-by-layer including layers styles (effects), styles attributes, layers visibility flags and highlights the differences.

ComparePSD compares two Adobe Photoshop PSD files for you and highlights the differences. Layer by layer. Effect by effect. Simple. And did we mention that ComparePSD is absolutely free?

compare two Adobe Photoshop files layer-by-layer a must-have tool for Photoshop professionals

This Week in Django is your ongoing source for all things Django. We have interviews, tips, special topics, screencasts, callcasts and a ton of fun.

git staging and branching

Git is a fast, flexible but challenging distributed version control system. Before jumping in: Understand regular version control Understand

Joel @Spolsky likes Mercurial so much he wrote a tutorial: http://www.joelonsoftware.com/items/2010/03/17.html and http://hginit.com/ – Guido van Rossum (gvanrossum) http://twitter.com/gvanrossum/statuses/10693471706

"If you come at Mercurial with a Subversion mindset, things will almost work, but when they don’t, you’ll be confused, unhappy, and unsuccessful, and you’ll hate Mercurial. Whereas if you free your mind and reimagine version control, and grok the zen of the difference between thinking about managing the versions vs. thinking about managing the changes, you’ll become enlightened and happy and realize that this is the way version control was meant to work."

on how to think distributed....

There are obviously many reasons why Git is awesome (and why it sucks too), and there comes a point where it helps to dispel some of the rumors and issues surrounding Git. The following list attempts to show what Git is not.

git resource

Leonard uses Tiddlywiki for worldcreation; I'd be curious whether any authors are now using Flashbake

Even Cory Doctorow's using Git .)

Beginners guide. Very good introduction.

starter for using a central git repo

Looks like the model we should use to start our migration away from svn.

protocols

Roger Johansson on GUI-based version control using Subversion on OS X. He mentions Coda, BBEdit, Cornerstone, Versions and TextMate.

git diff --staged git log --oneline --graph

If you're not yet sportin' the 1.6.3 hotness, here are ten reasons to Git up!

This is the Git reference site. This is meant to be a quick reference for learning and remembering the most important and commonly used Git commands. The commands are organized into sections of the type of operation you may be trying to do, and will preset the common options and commands needed to accomplish these common tasks.

Gitbox is a Mac OS X graphical interface for Git version control system. In a single window you see branches, history and working directory status. Everyday operations are easy: stage and unstage changes with a checkbox. Commit, pull, merge and push with a single click. Double-click a change to show a diff with FileMerge.app.

git

Creating mercurial repository only clones with --noupdate and storing them on Dropbox.

Dropbox as repo holder

1. Push a change from computer 1 while offline. Dropbox can't sync the repo since it's offline. 2. Push a change from computer 2 while online. Dropbox syncs the changes to the git repo. 3. Computer 1 goes online and Dropbox tries to sync the repo -> conflicts.