]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshake
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Jul 2017 19:56:19 +0000 (12:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Jul 2017 19:56:19 +0000 (12:56 -0700)
commit487fe1ffcd3b3a38477b7e564f235bb7d1b89ecc
tree84704f656f5b21785f3879e11cf6030495d2192e
parent5800c63717ae35286a1441f14ffff753e01f7e2b
parent2841e8f81cb2820024804b9341577be1d0ce1240
Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshake

* ls/filter-process-delayed:
  convert: add "status=delayed" to filter process protocol
  convert: refactor capabilities negotiation
  convert: move multiple file filter error handling to separate function
  convert: put the flags field before the flag itself for consistent style
  t0021: write "OUT <size>" only on success
  t0021: make debug log file name configurable
  t0021: keep filter log files on comparison
Documentation/gitattributes.txt
builtin/checkout.c
cache.h
convert.c
convert.h
unpack-trees.c