Fossil SCM

fixed a small lie.

stephan 2014-03-21 10:23 UTC trunk
Commit 0829160c5f872b33aec15a51b695ef05b4b9e4b0
1 file changed +5 -5
--- www/quickstart.wiki
+++ www/quickstart.wiki
@@ -129,15 +129,15 @@
129129
<b>[/help/update | fossil update]</b><br>
130130
<b>[/help/checkout | fossil checkout]</b><br>
131131
</blockquote>
132132
133133
<p>The [/help/checkout | checkout] or [/help/update | update]
134
- commands. [/help/update | update] honors the "autosync" option
135
- and does a "soft" switch, merging any local changes into the
136
- target version, whereas [/help/checkout | checkout] does not
137
- sync and does a "hard" switch, potentially overwriting local
138
- changes (after prompting).</p>
134
+ commands. [/help/update | update] honors the "autosync" option and
135
+ does a "soft" switch, merging any local changes into the target
136
+ version, whereas [/help/checkout | checkout] does not
137
+ automatically sync and does a "hard" switch, overwriting local
138
+ changes if told to do so.</p>
139139
140140
<h2>Configuring Your Local Repository</h2>
141141
142142
<p>When you create a new repository, either by cloning an existing
143143
project or create a new project of your own, you usually want to do some
144144
--- www/quickstart.wiki
+++ www/quickstart.wiki
@@ -129,15 +129,15 @@
129 <b>[/help/update | fossil update]</b><br>
130 <b>[/help/checkout | fossil checkout]</b><br>
131 </blockquote>
132
133 <p>The [/help/checkout | checkout] or [/help/update | update]
134 commands. [/help/update | update] honors the "autosync" option
135 and does a "soft" switch, merging any local changes into the
136 target version, whereas [/help/checkout | checkout] does not
137 sync and does a "hard" switch, potentially overwriting local
138 changes (after prompting).</p>
139
140 <h2>Configuring Your Local Repository</h2>
141
142 <p>When you create a new repository, either by cloning an existing
143 project or create a new project of your own, you usually want to do some
144
--- www/quickstart.wiki
+++ www/quickstart.wiki
@@ -129,15 +129,15 @@
129 <b>[/help/update | fossil update]</b><br>
130 <b>[/help/checkout | fossil checkout]</b><br>
131 </blockquote>
132
133 <p>The [/help/checkout | checkout] or [/help/update | update]
134 commands. [/help/update | update] honors the "autosync" option and
135 does a "soft" switch, merging any local changes into the target
136 version, whereas [/help/checkout | checkout] does not
137 automatically sync and does a "hard" switch, overwriting local
138 changes if told to do so.</p>
139
140 <h2>Configuring Your Local Repository</h2>
141
142 <p>When you create a new repository, either by cloning an existing
143 project or create a new project of your own, you usually want to do some
144

Keyboard Shortcuts

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