diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-10-06 13:40:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-06 13:40:11 -0700 |
| commit | d8d33378ed06f1dfb5118a9b961d179e55420b44 (patch) | |
| tree | f8c2ee1129c12518caf8aa2b75c0ba0ba3b04d62 /git-mergetool--lib.sh | |
| parent | Merge branch 'jk/grep-haystack-is-read-only' (diff) | |
| parent | repository.h: don't use a mix of int and bitfields (diff) | |
| download | tgif-d8d33378ed06f1dfb5118a9b961d179e55420b44.tar.xz | |
Merge branch 'ab/repo-settings-cleanup'
Code cleanup.
* ab/repo-settings-cleanup:
repository.h: don't use a mix of int and bitfields
repo-settings.c: simplify the setup
read-cache & fetch-negotiator: check "enum" values in switch()
environment.c: remove test-specific "ignore_untracked..." variable
wrapper.c: add x{un,}setenv(), and use xsetenv() in environment.c
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions