diff options
Diffstat (limited to 'web/input')
-rw-r--r-- | web/input/doc/faq/git.md | 22 |
1 files changed, 11 insertions, 11 deletions
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 | |||
8 | [Git][git] for its code repositories. This document is a quick introduction | 8 | [Git][git] for its code repositories. This document is a quick introduction |
9 | to Git. | 9 | to Git. |
10 | 10 | ||
11 | ## Differences Between Git and SVN | 11 | ## Basic Concepts |
12 | 12 | ||
13 | There is one huge difference between Git and SVN: Git is a distributed SCM | 13 | Git is a distributed source code management (SCM) system. This doesn’t mean |
14 | (Source Code Management system) while SVN is a centralized one. This doesn’t | 14 | we can’t have a central shared Git repository (and we indeed have one), this |
15 | mean we can’t have a central shared Git repository (and we indeed have one), | 15 | means distributed development can occur around that central repository. |
16 | this means distributed development can occur around that central repository. | 16 | |
17 | Another visible difference is that Git have more stages between the working | 17 | Git has an additional stage between the working directory and the repository. |
18 | directory and the repository. When you want to add files or changes, you use | 18 | When you want to add files or changes, you use |
19 | **git add**. This adds the changes to the repository index, which can be seen | 19 | **git add**. This adds the changes to the repository index, which can be seen |
20 | as a staging area. When you commit with **git commit**, only the changes in | 20 | as a staging area. When you commit with **git commit**, only the changes in |
21 | the index are considered. After committing, the changes are still local. To | 21 | the index are considered. After committing, the changes are still local. To |
22 | share it with others, you have to push it to a remote repository, or gave | 22 | share it with others, you have to push it to a remote repository, or gave |
23 | someone pull from your publicly accessible repository (in most case you will | 23 | someone pull from your publicly accessible repository (in most case you will |
24 | still have to push changes there, unless if you were running a git daemon | 24 | still have to push changes there, unless if you were running a git daemon |
25 | straight off your working repository). Finally you can’t miss the fact that | 25 | straight off your working repository). |
26 | |||
27 | Finally you can’t miss the fact that | ||
26 | there is no more revision numbers, and the distributed nature of Git is the | 28 | there is no more revision numbers, and the distributed nature of Git is the |
27 | reason for that: there is absolutely no way a single number could be tracked | 29 | reason for that: there is absolutely no way a single number could be tracked |
28 | in a distributed way. Instead Git uses SHA1 hashes to identify commits (as | 30 | in a distributed way. Instead Git uses SHA1 hashes to identify commits (as |
@@ -175,8 +177,6 @@ Chacon][scott]'s [Pro Git][book]. | |||
175 | <http://www.kernel.org/pub/software/scm/git/docs/everyday.html> | 177 | <http://www.kernel.org/pub/software/scm/git/docs/everyday.html> |
176 | - Git User’s Manual | 178 | - Git User’s Manual |
177 | <http://www.kernel.org/pub/software/scm/git/docs/user-manual.html> | 179 | <http://www.kernel.org/pub/software/scm/git/docs/user-manual.html> |
178 | - Git - SVN Crash Course | ||
179 | <http://git.or.cz/course/svn.html> | ||
180 | - Git QuickStart | 180 | - Git QuickStart |
181 | <http://git.or.cz/gitwiki/QuickStart> | 181 | <http://git.or.cz/gitwiki/QuickStart> |
182 | - Git CheatSheet | 182 | - Git CheatSheet |