diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-09 05:06:36 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-09 05:06:36 +0200 |
| commit | ca1c9913f8ac0ccaf976d44822076e1bba5bcd94 (patch) | |
| tree | aa320cfc93864826fd28f0a84bac76d9f12a2d5e /builtin-fetch-pack.c | |
| parent | Merge branch 'db/learn-HEAD' (diff) | |
| parent | merge, pull: add '--(no-)log' command line option (diff) | |
| download | git-ca1c9913f8ac0ccaf976d44822076e1bba5bcd94.tar.xz git-ca1c9913f8ac0ccaf976d44822076e1bba5bcd94.zip | |
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 'builtin-fetch-pack.c')
0 files changed, 0 insertions, 0 deletions