git is a distributed version control system. git is free software distributed under the GPL. git has a mutable index called stage. git track changes of files. my stupid boss still prefers SVN. creating a new branch is quick. <<<<<<< HEAD creating a new branch is quick and simple. ======= create a new branch is quick and simple. >>>>>>> featurel add merge