diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-07-25 14:13:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-25 14:13:39 -0700 |
| commit | 21bed620cd2d4fc4fb3d42447136c9f899ede5bb (patch) | |
| tree | 55fe7e104798ec1689d4e3513e81563a0188317f /git.c | |
| parent | Merge branch 'rs/worktree-use-strbuf-absolute-path' (diff) | |
| parent | merge: avoid "safer crlf" during recording of merge results (diff) | |
| download | tgif-21bed620cd2d4fc4fb3d42447136c9f899ede5bb.tar.xz | |
Merge branch 'jc/renormalize-merge-kill-safer-crlf'
"git merge" with renormalization did not work well with
merge-recursive, due to "safer crlf" conversion kicking in when it
shouldn't.
* jc/renormalize-merge-kill-safer-crlf:
merge: avoid "safer crlf" during recording of merge results
convert: unify the "auto" handling of CRLF
Diffstat (limited to 'git.c')
0 files changed, 0 insertions, 0 deletions