summaryrefslogtreecommitdiffhomepage
path: root/git.html.markdown
diff options
context:
space:
mode:
authorLevi Bostian <levi.bostian@banno.com>2013-11-25 09:42:37 -0600
committerLevi Bostian <levi.bostian@banno.com>2013-11-25 09:42:37 -0600
commitaf6701904b459b16cf65709cd8c70fd2f5519457 (patch)
tree68cb4bf9ead32686f492e68528e9f0761e41c500 /git.html.markdown
parentdf3cc00f5233dac96c0e063d87d3552f493e25f6 (diff)
parentd24c824d388669181eed99c3e94bb25c2914304a (diff)
Fix conflict bash.
Diffstat (limited to 'git.html.markdown')
-rw-r--r--git.html.markdown5
1 files changed, 2 insertions, 3 deletions
diff --git a/git.html.markdown b/git.html.markdown
index d8537300..4b5e466e 100644
--- a/git.html.markdown
+++ b/git.html.markdown
@@ -2,9 +2,8 @@
category: tool
tool: git
contributors:
- - ["Jake Prather", "http:#github.com/JakeHP"]
+ - ["Jake Prather", "http://github.com/JakeHP"]
filename: LearnGit.txt
-
---
Git is a distributed version control and source code management system.
@@ -41,7 +40,7 @@ Version control is a system that records changes to a file, or set of files, ove
### Repository
-A set of files, directories, historical records, commits, and heads. Imagine it as a source code datastructure,
+A set of files, directories, historical records, commits, and heads. Imagine it as a source code data structure,
with the attribute that each source code "element" gives you access to its revision history, among other things.
A git repository is comprised of the .git directory & working tree.