summaryrefslogtreecommitdiff
path: root/t/t5515/fetch.br-remote-explicit-merge
diff options
context:
space:
mode:
authorLibravatar SZEDER Gábor <szeder@ira.uka.de>2008-04-06 03:23:44 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-04-12 19:28:18 -0700
commit3e6c0a3fe3dcdbe6621b122a8a498a0d8627b425 (patch)
treee09b26d17a873a63d94e7088dff143a0af14d574 /t/t5515/fetch.br-remote-explicit-merge
parentmerge, pull: introduce '--(no-)stat' option (diff)
downloadtgif-3e6c0a3fe3dcdbe6621b122a8a498a0d8627b425.tar.xz
add 'merge.stat' config variable
This variable has the same effect, as 'merge.diffstat'. Also mention it in the documentation. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5515/fetch.br-remote-explicit-merge')
0 files changed, 0 insertions, 0 deletions