Re: [PATCH v3 00/13] fix mergetool+rerere+subdir regression

2017-01-09 Thread Stefan Beller
On Sun, Jan 8, 2017 at 9:42 PM, Richard Hansen wrote: > If rerere is enabled, no pathnames are given, and mergetool is run > from a subdirectory, mergetool always prints "No files need merging". > Fix the bug. > > This regression was introduced in > 57937f70a09c12ef484c290865dac4066d207c9c (v2.11.

[PATCH v3 00/13] fix mergetool+rerere+subdir regression

2017-01-08 Thread Richard Hansen
If rerere is enabled, no pathnames are given, and mergetool is run from a subdirectory, mergetool always prints "No files need merging". Fix the bug. This regression was introduced in 57937f70a09c12ef484c290865dac4066d207c9c (v2.11.0). Changes since v2: * Added entries to .mailmap. * Patch 2/