From: Junio C Hamano Date: Mon, 22 Apr 2013 18:26:56 +0000 (-0700) Subject: Merge branch 'js/rerere-forget-protect-against-NUL' into maint X-Git-Tag: v1.8.2.2~27 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/63a4d8d7236e03c8a8f30c2da83a84a8fe8dfe66?ds=inline;hp=--cc Merge branch 'js/rerere-forget-protect-against-NUL' into maint * js/rerere-forget-protect-against-NUL: rerere forget: do not segfault if not all stages are present rerere forget: grok files containing NUL --- 63a4d8d7236e03c8a8f30c2da83a84a8fe8dfe66