summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1d4c498)
raw | patch | inline | side by side (parent: 1d4c498)
author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | |
Mon, 29 Sep 2008 20:30:00 +0000 (22:30 +0200) | ||
committer | Shawn O. Pearce <spearce@spearce.org> | |
Tue, 30 Sep 2008 18:51:16 +0000 (11:51 -0700) |
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Documentation/RelNotes-1.6.1.txt | patch | blob | history | |
Documentation/git-read-tree.txt | patch | blob | history |
index 421e569ea0620c446471dc9a29c59940b0dd1357..906932cfa1a51c6cd0c7098eabd067b6698b7fa4 100644 (file)
* "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
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.
index 309deac23b5bf8eea28441d34e78b7cdb3a02d28..7160fa1536e3af2edbdfb6d1049f2145bf2b4f50 100644 (file)
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.