Jakub NarebskiSigned-off-by: Jakub Narebski <jnareb@gmail.com> --- I feel a bit silly signing off such simple patch.
The duplicated contents is: * "git diff" learned to put more sensible hunk headers for Python, HTML and ObjC contents.
There are two entries which talk about nearly the same things, but I am not sure there if it is duplication or not:
* "git diff" learned "textconv" filters --- a binary or hard-to-read contents can be munged into human readable form and the difference between the results of the conversion can be viewed (obviously this cannot produce a patch that can be applied, so this is disabled in format-patch among other things).
* a "textconv" filter that makes binary files textual form for human consumption can be specified as an attribute for paths; "git diff" learnt to make use of it.
Documentation/RelNotes-1.6.1.txt | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
Show changes to Documentation/RelNotes-1.6.1.txt +0 −2
diff --git a/Documentation/RelNotes-1.6.1.txt b/Documentation/RelNotes-1.6.1.txt index 9f5c0b5..a82e2ae 100644 --- a/Documentation/RelNotes-1.6.1.txt +++ b/Documentation/RelNotes-1.6.1.txt @@ -135,8 +135,6 @@ on. cannot produce a patch that can be applied, so this is disabled in format-patch among other things). -* "git diff" hunk header pattern for ObjC has been added. - * "--cached" option to "git diff has an easier to remember synonym "--staged", to ask "what is the difference between the given commit and the contents staged in the index?"
-- 1.6.0.4