Skip to content

Commit

Permalink
Correct typos in RelNotes-1.6.1
Browse files Browse the repository at this point in the history
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  • Loading branch information
Ralf Wildenhues authored and Shawn O. Pearce committed Sep 30, 2008
1 parent 1d4c498 commit 79fd4cc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Documentation/RelNotes-1.6.1.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ on.

* "git daemon" learned --max-connections=<count> option.

* "git diff" learned to mimick --suppress-blank-empty from GNU diff via a
* "git diff" learned to mimic --suppress-blank-empty from GNU diff via a
configuration option.

* "git diff" learned to put more sensible hunk headers for Python and
Expand Down Expand Up @@ -121,7 +121,7 @@ release, unless otherwise noted.
is a path in it).

* "git diff --stdin" used to take two trees on a line and compared them,
but we droppped support for such a use case long time ago. This has
but we dropped support for such a use case long time ago. This has
been resurrected.

* "git filter-branch" failed to rewrite a tag name with slashes in it.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-read-tree.txt
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ output after two-tree merge.

Case #3 is slightly tricky and needs explanation. The result from this
rule logically should be to remove the path if the user staged the removal
of the path and then swiching to a new branch. That however will prevent
of the path and then switching to a new branch. That however will prevent
the initial checkout from happening, so the rule is modified to use M (new
tree) only when the contents of the index is empty. Otherwise the removal
of the path is kept as long as $H and $M are the same.
Expand Down

0 comments on commit 79fd4cc

Please sign in to comment.