From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 31 Oct 2014 18:49:48 +0000 (-0700)
Subject: Merge branch 'rs/child-process-init'
X-Git-Tag: v2.2.0-rc0~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/598d7eb160c46e55cf5dc07d04c8c917bc0dd646?ds=inline;hp=-c

Merge branch 'rs/child-process-init'

* rs/child-process-init:
api-run-command: add missing list item marker
---

598d7eb160c46e55cf5dc07d04c8c917bc0dd646
diff --combined Documentation/technical/api-run-command.txt
index 3f12fcdd4c,866792f42e..a9fdb45b93
--- a/Documentation/technical/api-run-command.txt
+++ b/Documentation/technical/api-run-command.txt
@@@ -13,7 -13,7 +13,7 @@@ produces in the caller in order to proc
  Functions
  ---------
  
- `child_process_init`
+ `child_process_init`::
  
  	Initialize a struct child_process variable.
  
@@@ -169,11 -169,6 +169,11 @@@ string pointers (NULL terminated) in .e
  . If the string does not contain '=', it names an environment
    variable that will be removed from the child process's environment.
  
 +If the .env member is NULL, `start_command` will point it at the
 +.env_array `argv_array` (so you may use one or the other, but not both).
 +The memory in .env_array will be cleaned up automatically during
 +`finish_command` (or during `start_command` when it is unsuccessful).
 +
  To specify a new initial working directory for the sub-process,
  specify it in the .dir member.