File tree Expand file tree Collapse file tree 2 files changed +3
-3
lines changed
Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change 5959
6060* "git daemon" learned --max-connections=<count> option.
6161
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
6363 configuration option.
6464
6565* "git diff" learned to put more sensible hunk headers for Python and
@@ -121,7 +121,7 @@ release, unless otherwise noted.
121121 is a path in it).
122122
123123* "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
125125 been resurrected.
126126
127127* "git filter-branch" failed to rewrite a tag name with slashes in it.
Original file line number Diff line number Diff line change @@ -212,7 +212,7 @@ output after two-tree merge.
212212
213213Case #3 is slightly tricky and needs explanation. The result from this
214214rule 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
216216the initial checkout from happening, so the rule is modified to use M (new
217217tree) only when the contents of the index is empty. Otherwise the removal
218218of the path is kept as long as $H and $M are the same.
You can’t perform that action at this time.
0 commit comments