summaryrefslogtreecommitdiff
path: root/walker.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-09 03:06:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-05-09 03:06:36 (GMT)
commitca1c9913f8ac0ccaf976d44822076e1bba5bcd94 (patch)
treeaa320cfc93864826fd28f0a84bac76d9f12a2d5e /walker.c
parent31a3c6bb45aa61e45f1663871620eaf742f0abbb (diff)
parentefb779f8873e5aa36be29a4e551186c62c1b580c (diff)
downloadgit-ca1c9913f8ac0ccaf976d44822076e1bba5bcd94.zip
git-ca1c9913f8ac0ccaf976d44822076e1bba5bcd94.tar.gz
git-ca1c9913f8ac0ccaf976d44822076e1bba5bcd94.tar.bz2
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 'walker.c')
0 files changed, 0 insertions, 0 deletions