Fossil SCM

Fix typos in the fossil-v-git.wiki document.

drh 2016-06-10 13:46 UTC trunk
Commit 5566c8535ae3c0af98cf064bd3d370a197ba6867
1 file changed +4 -4
--- www/fossil-v-git.wiki
+++ www/fossil-v-git.wiki
@@ -4,11 +4,11 @@
44
55
If you start out using one DVCS and later decide you like the other better,
66
you can easily [./inout.wiki | move your content]¹.
77
88
Fossil and [http://git-scm.com | Git] are very similar in many respects,
9
-but there are also important differences.
9
+but they also have important differences.
1010
See the table below for
1111
a high-level summary and the text that follows for more details.
1212
1313
Keep in mind that you are reading this on a Fossil website,
1414
so the information here
@@ -40,11 +40,11 @@
4040
4141
<h2>3.0 Discussion</h2>
4242
4343
<h3>3.1 Feature Set</h3>
4444
45
-Git provides file versioning services only, whereas Fossil adds an
45
+Git provides file versioning services only, whereas Fossil adds
4646
integrated [./wikitheory.wiki | wiki],
4747
[./bugtheory.wiki | ticketing &amp; bug tracking],
4848
[./embeddeddoc.wiki | embedded documentation], and
4949
[./event.wiki | Technical notes].
5050
These additional capabilities are available for Git as 3rd-party and/or
@@ -79,11 +79,11 @@
7979
Fossil uses a proven, general-purpose SQL database. This
8080
difference is more than an implementation detail. It
8181
has important consequences.
8282
8383
With Git, one can easily locate the ancestors of a particular check-in
84
-by following the pointers embedded the check-in object, but it is
84
+by following the pointers embedded in the check-in object, but it is
8585
difficult to go the other direction and locate the descendants of a
8686
check-in. It is so difficult, in fact, that neither native Git nor
8787
GitHub provide this capability. With Git, if you are looking at some
8888
historical check-in then you cannot ask
8989
"what came next" or "what are the children of this check-in".
@@ -122,11 +122,11 @@
122122
They can be. But those modes are not their design intent nor the their
123123
low-friction path.
124124
125125
Git encourages a style in which individual developers work in relative
126126
isolation, maintaining their
127
-own branches and the occasionally rebasing and pushing selected changes up
127
+own branches and occasionally rebasing and pushing selected changes up
128128
to the main repository. Developers using Git often have their own
129129
private branches that nobody else ever sees. Work becomes siloed.
130130
This is exactly what one wants when doing bazaar-style development.
131131
132132
Fossil, in contrast, strives to keep all changes from all contributors
133133
--- www/fossil-v-git.wiki
+++ www/fossil-v-git.wiki
@@ -4,11 +4,11 @@
4
5 If you start out using one DVCS and later decide you like the other better,
6 you can easily [./inout.wiki | move your content]&#185;.
7
8 Fossil and [http://git-scm.com | Git] are very similar in many respects,
9 but there are also important differences.
10 See the table below for
11 a high-level summary and the text that follows for more details.
12
13 Keep in mind that you are reading this on a Fossil website,
14 so the information here
@@ -40,11 +40,11 @@
40
41 <h2>3.0 Discussion</h2>
42
43 <h3>3.1 Feature Set</h3>
44
45 Git provides file versioning services only, whereas Fossil adds an
46 integrated [./wikitheory.wiki | wiki],
47 [./bugtheory.wiki | ticketing &amp; bug tracking],
48 [./embeddeddoc.wiki | embedded documentation], and
49 [./event.wiki | Technical notes].
50 These additional capabilities are available for Git as 3rd-party and/or
@@ -79,11 +79,11 @@
79 Fossil uses a proven, general-purpose SQL database. This
80 difference is more than an implementation detail. It
81 has important consequences.
82
83 With Git, one can easily locate the ancestors of a particular check-in
84 by following the pointers embedded the check-in object, but it is
85 difficult to go the other direction and locate the descendants of a
86 check-in. It is so difficult, in fact, that neither native Git nor
87 GitHub provide this capability. With Git, if you are looking at some
88 historical check-in then you cannot ask
89 "what came next" or "what are the children of this check-in".
@@ -122,11 +122,11 @@
122 They can be. But those modes are not their design intent nor the their
123 low-friction path.
124
125 Git encourages a style in which individual developers work in relative
126 isolation, maintaining their
127 own branches and the occasionally rebasing and pushing selected changes up
128 to the main repository. Developers using Git often have their own
129 private branches that nobody else ever sees. Work becomes siloed.
130 This is exactly what one wants when doing bazaar-style development.
131
132 Fossil, in contrast, strives to keep all changes from all contributors
133
--- www/fossil-v-git.wiki
+++ www/fossil-v-git.wiki
@@ -4,11 +4,11 @@
4
5 If you start out using one DVCS and later decide you like the other better,
6 you can easily [./inout.wiki | move your content]&#185;.
7
8 Fossil and [http://git-scm.com | Git] are very similar in many respects,
9 but they also have important differences.
10 See the table below for
11 a high-level summary and the text that follows for more details.
12
13 Keep in mind that you are reading this on a Fossil website,
14 so the information here
@@ -40,11 +40,11 @@
40
41 <h2>3.0 Discussion</h2>
42
43 <h3>3.1 Feature Set</h3>
44
45 Git provides file versioning services only, whereas Fossil adds
46 integrated [./wikitheory.wiki | wiki],
47 [./bugtheory.wiki | ticketing &amp; bug tracking],
48 [./embeddeddoc.wiki | embedded documentation], and
49 [./event.wiki | Technical notes].
50 These additional capabilities are available for Git as 3rd-party and/or
@@ -79,11 +79,11 @@
79 Fossil uses a proven, general-purpose SQL database. This
80 difference is more than an implementation detail. It
81 has important consequences.
82
83 With Git, one can easily locate the ancestors of a particular check-in
84 by following the pointers embedded in the check-in object, but it is
85 difficult to go the other direction and locate the descendants of a
86 check-in. It is so difficult, in fact, that neither native Git nor
87 GitHub provide this capability. With Git, if you are looking at some
88 historical check-in then you cannot ask
89 "what came next" or "what are the children of this check-in".
@@ -122,11 +122,11 @@
122 They can be. But those modes are not their design intent nor the their
123 low-friction path.
124
125 Git encourages a style in which individual developers work in relative
126 isolation, maintaining their
127 own branches and occasionally rebasing and pushing selected changes up
128 to the main repository. Developers using Git often have their own
129 private branches that nobody else ever sees. Work becomes siloed.
130 This is exactly what one wants when doing bazaar-style development.
131
132 Fossil, in contrast, strives to keep all changes from all contributors
133

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button