Re: [PATCH v2 4/4] mergetool: fix running in subdir when rerere enabled

2017-01-06 Thread Richard Hansen
On 2017-01-06 04:42, Johannes Sixt wrote: Am 06.01.2017 um 02:09 schrieb Richard Hansen: If rerere is enabled and no pathnames are given, run cd_to_toplevel before running 'git diff --name-only' so that 'git diff --name-only' sees the pathnames emitted by 'git rerere remaining'. Also run cd_to_

Re: [PATCH v2 4/4] mergetool: fix running in subdir when rerere enabled

2017-01-06 Thread Johannes Sixt
Am 06.01.2017 um 02:09 schrieb Richard Hansen: If rerere is enabled and no pathnames are given, run cd_to_toplevel before running 'git diff --name-only' so that 'git diff --name-only' sees the pathnames emitted by 'git rerere remaining'. Also run cd_to_toplevel before running 'git rerere remaini