summaryrefslogtreecommitdiff
path: root/mailmap.h
diff options
context:
space:
mode:
authorCharles Bailey <charles@hashpling.org>2009-01-30 23:20:11 +0000
committerJunio C Hamano <gitster@pobox.com>2009-01-31 10:28:33 -0800
commitff4a18552aa48f3227e2465072951dacc34aee9b (patch)
tree77bcfdf9d64beab8ffd4ec4702edb65614f8d60f /mailmap.h
parentb9b5078ece4b22c14a36f20bd9dce88d2f350a36 (diff)
downloadgit-ff4a18552aa48f3227e2465072951dacc34aee9b.tar.gz
mergetool: fix running mergetool in sub-directories
The previous fix to mergetool to use checkout-index instead of cat-file broke running mergetool anywhere except the root of the repository. This fixes it by using the correct relative paths for temporary files and index paths. Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mailmap.h')
0 files changed, 0 insertions, 0 deletions