diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-11-29 15:41:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-11-29 15:41:50 -0800 |
| commit | ad1260b6c994f7c0f9c259bd39f39979f7f4ecc2 (patch) | |
| tree | 178477065b014826267a1f39a8447a4ac58c0949 /git-merge-octopus.sh | |
| parent | Merge branch 'tb/plug-pack-bitmap-leaks' (diff) | |
| parent | git-sh-setup: remove "sane_grep", it's not needed anymore (diff) | |
| download | tgif-ad1260b6c994f7c0f9c259bd39f39979f7f4ecc2.tar.xz | |
Merge branch 'ab/sh-retire-helper-functions'
Make a few helper functions unused and then lose them.
* ab/sh-retire-helper-functions:
git-sh-setup: remove "sane_grep", it's not needed anymore
git-sh-setup: remove unused sane_egrep() function
git-instaweb: unconditionally assume that gitweb is mod_perl capable
Makefile: remove $(NO_CURL) from $(SCRIPT_DEFINES)
Makefile: remove $(GIT_VERSION) from $(SCRIPT_DEFINES)
Makefile: move git-SCRIPT-DEFINES adjacent to $(SCRIPT_DEFINES)
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions