summaryrefslogtreecommitdiff
path: root/merge-blobs.c
diff options
context:
space:
mode:
authorMark Levedahl <mlevedahl@gmail.com>2025-05-20 10:08:44 -0400
committerMark Levedahl <mlevedahl@gmail.com>2025-07-19 09:12:11 -0400
commite80065ecd700334fbc9f1de31320b83a894cfa06 (patch)
tree5246d6020b776528859aa8853b63d83786c1192d /merge-blobs.c
parentb76a5a854bfae6542eec333365b218c5bc0fdf5b (diff)
git-gui: let nice work on Windows
git-gui runs blame and diff commands with nice by default. On Unix, nice is accepted if found and it will run git. Commit ff9db6c79d ("On Windows, avoid git-gui to call Cygwin's nice utility", 2010-10-05) rejects nice if not collocated with git. In Git for Windows' (g4w) POSIX path name space, nice and git are found in different directories: $ which git /mingw64/bin/git $ which nice /usr/bin/nice Thus, git-gui will not use nice in the supported Windows configuration. Commit ff9db6c79d justifies the collocation requirement as avoiding problems in a mixed MSYS and Cygwin configuration: such configurations are not supported by either project as they are known to cause many problems. So, let's revert ff9db6c79d and let git-gui work correctly in the supported configuration. Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
Diffstat (limited to 'merge-blobs.c')
0 files changed, 0 insertions, 0 deletions