From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Nov 2009 00:41:07 +0000 (-0800)
Subject: Merge branch 'js/log-rewrap'
X-Git-Tag: v1.6.6-rc0~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ef705eff6afbc676ab2999dbcdb1a7c8fbf62e6;p=thirdparty%2Fgit.git

Merge branch 'js/log-rewrap'

* js/log-rewrap:
  Teach --wrap to only indent without wrapping
  Add strbuf_add_wrapped_text() to utf8.[ch]
  print_wrapped_text(): allow hard newlines
---

7ef705eff6afbc676ab2999dbcdb1a7c8fbf62e6