From df26d5827b8118c01ef203b5e87833d3d7b7434b Mon Sep 17 00:00:00 2001 From: Holger Weiss Date: Sat, 11 Jan 2014 22:27:59 +0100 Subject: doc/faq/git.md: Omit most references to SVN This text was written a few years ago, when we switched from SVN to Git. These days, it makes less sense to assume the reader is accustomed to SVN but not to Git. diff --git a/web/input/doc/faq/git.md b/web/input/doc/faq/git.md index 05fd533..71200c8 100644 --- a/web/input/doc/faq/git.md +++ b/web/input/doc/faq/git.md @@ -8,21 +8,23 @@ After the 1.4.13 release, the [Nagios Plugins Development Team][team] moved to [Git][git] for its code repositories. This document is a quick introduction to Git. -## Differences Between Git and SVN - -There is one huge difference between Git and SVN: Git is a distributed SCM -(Source Code Management system) while SVN is a centralized one. This doesn’t -mean we can’t have a central shared Git repository (and we indeed have one), -this means distributed development can occur around that central repository. -Another visible difference is that Git have more stages between the working -directory and the repository. When you want to add files or changes, you use +## Basic Concepts + +Git is a distributed source code management (SCM) system. This doesn’t mean +we can’t have a central shared Git repository (and we indeed have one), this +means distributed development can occur around that central repository. + +Git has an additional stage between the working directory and the repository. +When you want to add files or changes, you use **git add**. This adds the changes to the repository index, which can be seen as a staging area. When you commit with **git commit**, only the changes in the index are considered. After committing, the changes are still local. To share it with others, you have to push it to a remote repository, or gave someone pull from your publicly accessible repository (in most case you will still have to push changes there, unless if you were running a git daemon -straight off your working repository). Finally you can’t miss the fact that +straight off your working repository). + +Finally you can’t miss the fact that there is no more revision numbers, and the distributed nature of Git is the reason for that: there is absolutely no way a single number could be tracked in a distributed way. Instead Git uses SHA1 hashes to identify commits (as @@ -175,8 +177,6 @@ Chacon][scott]'s [Pro Git][book]. - Git User’s Manual -- Git - SVN Crash Course - - Git QuickStart - Git CheatSheet -- cgit v0.10-9-g596f