| commit | 426d4e24a97e9f3dfc78363921c3e54f0087f61c | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Apr 2013 21:32:58 +0000 (5 14:32 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Apr 2013 21:32:59 +0000 (5 14:32 -0700) | ||
| tree | 1e35e0e6cbb1b5bf970c4abfdbe37edbe8b901a2 | treesnapshot (tar.gz zip) |
| parent | eae93efa005f834d207095ac60f2c9a812b935eb | commitdiff |
| parent | b9e31f59478eeae3e4230308f6fc06713c6fc547 | commitdiff |
Merge branch 'js/rerere-forget-protect-against-NUL' into next
A few bugfixes to "git rerere" working on corner case merge
conflicts.
* js/rerere-forget-protect-against-NUL:
rerere forget: do not segfault if not all stages are present
rerere forget: grok files containing NUL
A few bugfixes to "git rerere" working on corner case merge
conflicts.
* js/rerere-forget-protect-against-NUL:
rerere forget: do not segfault if not all stages are present
rerere forget: grok files containing NUL