summaryrefslogtreecommitdiff
path: root/Documentation/git-annotate.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-11-29 13:27:56 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-11-29 13:27:56 -0800
commit729fb9ad34cda2609396a61697508c61ec7d9f04 (patch)
treeffaef10d2f6dfd2a8fd7ba5ec3b97bb3f3da26d1 /Documentation/git-annotate.txt
parentMerge branch 'as/merge-attr-sleep' into maint (diff)
parenttravis-ci: disable GIT_TEST_HTTPD for macOS (diff)
downloadtgif-729fb9ad34cda2609396a61697508c61ec7d9f04.tar.xz
Merge branch 'ls/macos-update' into maint
Portability update and workaround for builds on recent Mac OS X. * ls/macos-update: travis-ci: disable GIT_TEST_HTTPD for macOS Makefile: set NO_OPENSSL on macOS by default
Diffstat (limited to 'Documentation/git-annotate.txt')
0 files changed, 0 insertions, 0 deletions