Correct typos in RelNotes-1.6.1
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Ralf Wildenhues committed
Sep 29, 2008 at 22:30 UTC
79fd4cc749826dd78c6ab3cd225bdb5c92db2de8
2 files changed
+3
-3
Documentation/RelNotes-1.6.1.txt
+2
-2
@@ -59,7 +59,7 @@ on.
59
60
* "git daemon" learned --max-connections=<count> option.
61
62
-* "git diff" learned to mimick --suppress-blank-empty from GNU diff via a
62
+* "git diff" learned to mimic --suppress-blank-empty from GNU diff via a
63
configuration option.
64
65
* "git diff" learned to put more sensible hunk headers for Python and
@@ -121,7 +121,7 @@ release, unless otherwise noted.
121
is a path in it).
122
123
* "git diff --stdin" used to take two trees on a line and compared them,
124
- but we droppped support for such a use case long time ago. This has
124
+ but we dropped support for such a use case long time ago. This has
125
been resurrected.
126
127
* "git filter-branch" failed to rewrite a tag name with slashes in it.
Documentation/git-read-tree.txt
+1
-1
@@ -212,7 +212,7 @@ output after two-tree merge.
212
213
Case #3 is slightly tricky and needs explanation. The result from this
214
rule logically should be to remove the path if the user staged the removal
215
-of the path and then swiching to a new branch. That however will prevent
215
+of the path and then switching to a new branch. That however will prevent
216
the initial checkout from happening, so the rule is modified to use M (new
217
tree) only when the contents of the index is empty. Otherwise the removal
218
of the path is kept as long as $H and $M are the same.