diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-12-10 10:04:53 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-12-10 10:04:53 +0900 |
| commit | 9cd1e2e1a0350a3b6cbc4bcd268f0cbbe8c89687 (patch) | |
| tree | 60dc05a152f544ebaae8732e43ae6d556a77a448 /builtin/upload-pack.c | |
| parent | Merge branch 'jc/doc-opt-tilde-expand' (diff) | |
| parent | git-difftool--helper.sh: exit upon initialize_merge_tool errors (diff) | |
| download | git-9cd1e2e1a0350a3b6cbc4bcd268f0cbbe8c89687.tar.gz git-9cd1e2e1a0350a3b6cbc4bcd268f0cbbe8c89687.zip | |
Merge branch 'pb/mergetool-errors'
End-user experience of "git mergetool" when the command errors out
has been improved.
* pb/mergetool-errors:
git-difftool--helper.sh: exit upon initialize_merge_tool errors
git-mergetool--lib.sh: add error message for unknown tool variant
git-mergetool--lib.sh: add error message if 'setup_user_tool' fails
git-mergetool--lib.sh: use TOOL_MODE when erroring about unknown tool
completion: complete '--tool-help' in 'git mergetool'
Diffstat (limited to 'builtin/upload-pack.c')
0 files changed, 0 insertions, 0 deletions