summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-11 13:05:45 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-11 13:05:45 -0700
commit77f3c3f17401a74b9036188a6a6a4fe2c4b53ccb (patch)
tree495b1e7e6400c0fb506d97bceb3bacd005f9021e /git-rebase--interactive.sh
parente29497d28ce1ec9f76493542fcab4a8d61ca5fce (diff)
parent5430bb283b478991a979437a79e10dcbb6f20e28 (diff)
downloadgit-77f3c3f17401a74b9036188a6a6a4fe2c4b53ccb.tar.gz
Merge branch 'jc/maint-diff-core-safecrlf'
"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. * jc/maint-diff-core-safecrlf: diff: demote core.safecrlf=true to core.safecrlf=warn
Diffstat (limited to 'git-rebase--interactive.sh')
0 files changed, 0 insertions, 0 deletions