diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-09-08 13:30:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-08 13:30:29 -0700 |
| commit | 4293c057dcc8a8806d158a4c1f27deca34245558 (patch) | |
| tree | eb871e35d93ce1245726aad1c05b6062dd0d113a /t/t6417-merge-ours-theirs.sh | |
| parent | Merge branch 'ab/rebase-fatal-fatal-fix' (diff) | |
| parent | maintenance: skip bootout/bootstrap when plist is registered (diff) | |
| download | tgif-4293c057dcc8a8806d158a4c1f27deca34245558.tar.xz | |
Merge branch 'js/maintenance-launchctl-fix'
"git maintenance" scheduler fix for macOS.
* js/maintenance-launchctl-fix:
maintenance: skip bootout/bootstrap when plist is registered
maintenance: create `launchctl` configuration using a lock file
Diffstat (limited to 't/t6417-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions