Git is a disttibuted version control system. Git is a free software distributed under the GPL. Git has a mutable index called stage. Git tracks changes of files. Creating a new branch is quick and simple. <<<<<<< HEAD ======= Creating a new branch is quick AND simple. >>>>>>> feature1 add a new line test --no-diff.