]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'cc/replace-edit'
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Jul 2014 18:25:47 +0000 (11:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Jul 2014 18:25:47 +0000 (11:25 -0700)
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

1  2 
daemon.c

diff --cc daemon.c
Simple merge