Code

Merge branch 'jn/merge-renormalize'
authorJunio C Hamano <gitster@pobox.com>
Fri, 3 Sep 2010 16:43:41 +0000 (09:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 3 Sep 2010 16:43:41 +0000 (09:43 -0700)
commit8aed4a5e38a2a4f31567e01ab2a73341e972c08a
tree349cd09847bc932588ca38634b75a65846f82751
parent22ffc39a0332e892ddbf16b39d9b611aff238d9b
parent7610fa57e63b0acc0a66717fc2d85755634db591
Merge branch 'jn/merge-renormalize'

* jn/merge-renormalize:
  merge-recursive --renormalize
  rerere: never renormalize
  rerere: migrate to parse-options API
  t4200 (rerere): modernize style
  ll-merge: let caller decide whether to renormalize
  ll-merge: make flag easier to populate
  Documentation/technical: document ll_merge
  merge-trees: let caller decide whether to renormalize
  merge-trees: push choice to renormalize away from low level
  t6038 (merge.renormalize): check that it can be turned off
  t6038 (merge.renormalize): try checkout -m and cherry-pick
  t6038 (merge.renormalize): style nitpicks
  Don't expand CRLFs when normalizing text during merge
  Try normalizing files to avoid delete/modify conflicts when merging
  Avoid conflicts when merging branches with mixed normalization

Conflicts:
builtin/rerere.c
t/t4200-rerere.sh
Documentation/gitattributes.txt
builtin/checkout.c
builtin/merge-recursive.c
builtin/merge.c
builtin/rerere.c
builtin/revert.c
cache.h
merge-recursive.c
merge-recursive.h
rerere.c
t/t4200-rerere.sh