| commit | 331f06d6f1cc0e164c4aa320c2659d99de67f2f6 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 19 Aug 2016 22:34:15 +0000 (19 15:34 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 19 Aug 2016 22:34:15 +0000 (19 15:34 -0700) | ||
| tree | 11d0d72bcfa5334a90bc2a5399f32973d4eb5620 | treesnapshot (tar.gz zip) |
| parent | e6dab9f62fbda86d0adb530f0c2a543e3e2ed118 | commitdiff |
| parent | 45a4f5d9f99334151af90b2199004ec49a651d7a | commitdiff |
Merge branch 'jk/difftool-command-not-found'
"git difftool" by default ignores the error exit from the backend
commands it spawns, because often they signal that they found
differences by exiting with a non-zero status code just like "diff"
does; the exit status codes 126 and above however are special in
that they are used to signal that the command is not executable,
does not exist, or killed by a signal. "git difftool" has been
taught to notice these exit status codes.
* jk/difftool-command-not-found:
difftool: always honor fatal error exit codes
"git difftool" by default ignores the error exit from the backend
commands it spawns, because often they signal that they found
differences by exiting with a non-zero status code just like "diff"
does; the exit status codes 126 and above however are special in
that they are used to signal that the command is not executable,
does not exist, or killed by a signal. "git difftool" has been
taught to notice these exit status codes.
* jk/difftool-command-not-found:
difftool: always honor fatal error exit codes