summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-04-16 12:42:48 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-04-16 12:42:48 -0700
commit0f3ddd4a3abe863fae9c36ec4311ac936a2d8ed9 (patch)
treeb8e6c0b432a713f0e4ec98e215210235faae863b /builtin/merge-ours.c
parentMerge branch 'jk/http-backend-keep-committer-ident-env' (diff)
parentgitweb: add If-Modified-Since handling to git_snapshot(). (diff)
downloadtgif-0f3ddd4a3abe863fae9c36ec4311ac936a2d8ed9.tar.xz
Merge branch 'wk/gitweb-snapshot-use-if-modified-since'
Makes 'snapshot' request to "gitweb" honor If-Modified-Since: header, based on the commit date. By W. Trevor King * wk/gitweb-snapshot-use-if-modified-since: gitweb: add If-Modified-Since handling to git_snapshot(). gitweb: refactor If-Modified-Since handling gitweb: add `status` headers to git_feed() responses.
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions