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

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 <gitster@pobox.com>
Merge branch 'jc/maint-diff-core-safecrlf' into jch

"git diff" refused to even show difference when core.safecrlf is
set to true (i.e. error out) and there are offending lines in the
working tree files.

Will hold for a while to see if anybody can come up with better
tests.

* jc/maint-diff-core-safecrlf:
  diff: demote core.safecrlf=true to core.safecrlf=warn
### 2.0
Merge branch 'jc/push-2.0-default-to-simple' into jch

* jc/push-2.0-default-to-simple:
  push: switch default from "matching" to "simple"

# Conflicts:
# 	Documentation/config.txt
# 	Documentation/git-push.txt
# 	builtin/push.c
Merge branch 'jn/add-2.0-u-A-sans-pathspec' into jch

* jn/add-2.0-u-A-sans-pathspec:
  git add: -u/-A now affects the entire working tree
Merge branch 'jc/add-2.0-ignore-removal' into jch

Updated endgame for "git add <pathspec>" that defaults to "--all"
aka "--no-ignore-removal".

* jc/add-2.0-ignore-removal:
  git add <pathspec>... defaults to "-A"

# Conflicts:
# 	builtin/add.c
Merge branch 'jc/core-checkstat-2.0' into jch

* jc/core-checkstat-2.0:
  core.statinfo: remove as promised in Git 2.0
Merge branch 'completion-fixes' into jk/pu

* branch completion-fixes:
  completion: learn about --man-path
  completion: handle unstuck form of base git options

Submitted upstream.
Merge branch 'rebase-i-comment-squash' into jk/pu

* branch rebase-i-comment-squash:
  rebase -i: comment first line of autosquashed message

Comment out the first line of a "!squash" commit when generating a
commit message in git-rebase.

Merged to jk/pu on 2013-03-30.  Dogfooding for a while to see if
this is a sensible change.
Merge branch 'python-2to3-in-makefile' into jk/pu

* branch python-2to3-in-makefile:
  fixup! svn-fe: allow svnrdump_sim.py to run with Python 3
  Makefile: Run 2to3 on Python scripts
Merge branch 'revision-cherry-respect-ancestry-path' into jk/pu

* branch revision-cherry-respect-ancestry-path:
  revision.c: apply ancestry path before cherry
  revision.c: don't inspect uninteresting commits for cherry

Make revision.c's cherry options respect commit limiting.

Conflicts:
	revision.c
Merge branch 'patch-id-notes-cache' into jk/pu

* branch patch-id-notes-cache:
  patch-ids: cache patch IDs in a notes tree

Experiment to cache patch IDs in a notes tree.
Merge branch 'patch-id-limit-paths' into jk/pu

* branch patch-id-limit-paths:
  WIP
  patch-ids: check modified paths before calculating diff
  tree-walk.h: extract alloc_traverse_path from builtin/merge-tree.c

Conflicts:
	patch-ids.c
	patch-ids.h
Merge branch 'format-patch-msgstore' into jk/pu

* branch format-patch-msgstore:
  msgstore-gmane: new Gmane message store helper
  format-patch: extract Cc recipients from in-reply-to message
  Extract RFC2822 from builtin/mailinfo.c
  rfc2822: extract header handling from mailinfo
  format-patch: dedup Cc list