Merge branch 'cc/replace-edit'
commitdcc1b3851779ba1e3f55c1116852d87999d2c936
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Jul 2014 18:25:47 +0000 (16 11:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Jul 2014 18:25:47 +0000 (16 11:25 -0700)
tree830c6d990a782ca462d3a09d86d763f0ea2c9ca1
parentb5f7b21e5983b1f3a86c1b37f9244eda97dfb65a
parent36857e0026f5a7855f941a955bf7014408a816dd
Merge branch 'cc/replace-edit'

Teach "git replace" an "--edit" mode.

* cc/replace-edit:
  replace: use argv_array in export_object
  avoid double close of descriptors handed to run_command
  replace: replace spaces with tabs in indentation
daemon.c