summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2012-11-30 17:40:50 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-12-02 02:04:50 -0800
commit13274526c1fc62fd0f15fe2bc188843982f38ec9 (patch)
tree9344ae99dc8c156f94725fb29e45d5621ae989e1 /Documentation/merge-strategies.txt
parentMerge branch 'tj/maint-doc-commit-sign' (diff)
downloadtgif-13274526c1fc62fd0f15fe2bc188843982f38ec9.tar.xz
run-command: drop silent_exec_failure arg from wait_or_whine
We do not actually use this parameter; instead we complain from the child itself (for fork/exec) or from start_command (if we are using spawn on Windows). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions