summaryrefslogtreecommitdiff
path: root/fmt-merge-msg.h
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2019-03-14 04:25:04 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-03-18 11:48:19 +0900
commit20de316e33446f37200e51aa333ba7d824dfd478 (patch)
treed9a485cf00354fa2442b196a69003554b9bb2a19 /fmt-merge-msg.h
parentparse-options: make OPT_ARGUMENT() more useful (diff)
downloadtgif-20de316e33446f37200e51aa333ba7d824dfd478.tar.xz
difftool: allow running outside Git worktrees with --no-index
As far as this developer can tell, the conversion from a Perl script to a built-in caused the regression in the difftool that it no longer runs outside of a Git worktree (with `--no-index`, of course). It is a bit embarrassing that it took over two years after retiring the Perl version to discover this regression, but at least we now know, and can do something, about it. This fixes https://github.com/git-for-windows/git/issues/2123 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fmt-merge-msg.h')
0 files changed, 0 insertions, 0 deletions