git/diff.c, branch v1.8.3.4

Merge branch 'jc/maint-diff-core-safecrlf' into maint

2013-07-22T05:48:13Z

Avoid failing "git diff" when core.safecrlf is set to true, because the user cannot tell where the breakage is in preparation for fixing and committing. * jc/maint-diff-core-safecrlf: diff: demote core.safecrlf=true to core.safecrlf=warn

diff: demote core.safecrlf=true to core.safecrlf=warn

2013-06-25T20:55:03Z

Otherwise the user will not be able to start to guess where in the contents in the working tree the offending unsafe CR lies. Signed-off-by: Junio C Hamano

Merge branch 'jk/diff-graph-submodule-summary'

2013-04-15T19:41:01Z

Make "git diff --graph" work better with submodule log output. * jk/diff-graph-submodule-summary: submodule: print graph output next to submodule log

Merge branch 'jk/diff-algo-finishing-touches'

2013-04-15T19:40:58Z

"git diff --diff-algorithm algo" is also understood as "git diff --diff-algorithm=algo". * jk/diff-algo-finishing-touches: diff: allow unstuck arguments with --diff-algorithm git-merge(1): document diff-algorithm option to merge-recursive

Correct common spelling mistakes in comments and tests

2013-04-12T20:38:40Z

Most of these were found using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini Signed-off-by: Jonathan Nieder Acked-by: Matthieu Moy Signed-off-by: Junio C Hamano

submodule: print graph output next to submodule log

2013-04-05T18:28:10Z

When running "git log -p --submodule=log", the submodule log is not indented by the graph output, although all other lines are. Fix this by prepending the current line prefix to each line of the submodule log. Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

diff: allow unstuck arguments with --diff-algorithm

2013-04-05T18:01:08Z

The argument to --diff-algorithm is mandatory, so there is no reason to require the argument to be stuck to the option with '='. Change this for consistency with other Git commands. Note that this does not change the handling of diff-algorithm in merge-recursive.c since the primary interface to that is via the -X option to 'git merge' where the unstuck form does not make sense. Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint

2013-04-01T16:19:47Z

* ap/maint-diff-rename-avoid-overlap: tests: make sure rename pretty print works diff: prevent pprint_rename from underrunning input diff: Fix rename pretty-print when suffix and prefix overlap

Merge branch 'ap/maint-diff-rename-avoid-overlap'

2013-03-25T21:00:37Z

The logic used by "git diff -M --stat" to shorten the names of files before and after a rename did not work correctly when the common prefix and suffix between the two filenames overlapped. * ap/maint-diff-rename-avoid-overlap: tests: make sure rename pretty print works diff: prevent pprint_rename from underrunning input diff: Fix rename pretty-print when suffix and prefix overlap

diff.c: diff.renamelimit => diff.renameLimit in message

2013-03-21T21:06:49Z

In the warning message printed when rename or unmodified copy detection was skipped due to too many files, change "diff.renamelimit" to "diff.renameLimit", in order to make it consistent with git documentation, which consistently uses "diff.renameLimit". Signed-off-by: Max Nanasy Signed-off-by: Junio C Hamano