summaryrefslogtreecommitdiff
path: root/run-command.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-05-08 20:06:36 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-05-08 20:06:36 -0700
commitca1c9913f8ac0ccaf976d44822076e1bba5bcd94 (patch)
treeaa320cfc93864826fd28f0a84bac76d9f12a2d5e /run-command.c
parentMerge branch 'db/learn-HEAD' (diff)
parentmerge, pull: add '--(no-)log' command line option (diff)
downloadtgif-ca1c9913f8ac0ccaf976d44822076e1bba5bcd94.tar.xz
Merge branch 'sg/merge-options' (early part)
* 'sg/merge-options' (early part): merge, pull: add '--(no-)log' command line option fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable add 'merge.stat' config variable merge, pull: introduce '--(no-)stat' option doc: moved merge.* config variables into separate merge-config.txt
Diffstat (limited to 'run-command.c')
0 files changed, 0 insertions, 0 deletions