![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 9 May 2008 03:06:36 +0000 (20:06 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 9 May 2008 03:06:36 +0000 (20:06 -0700) | ||
| commit | ca1c9913f8ac0ccaf976d44822076e1bba5bcd94 | |
| tree | aa320cfc93864826fd28f0a84bac76d9f12a2d5e | tree | snapshot |
| parent | 31a3c6bb45aa61e45f1663871620eaf742f0abbb | commit | diff |
| parent | efb779f8873e5aa36be29a4e551186c62c1b580c | commit | diff |
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
* '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
| Documentation/config.txt | diff1 | | diff2 | | blob | history |
| builtin-fmt-merge-msg.c | diff1 | | diff2 | | blob | history |
| contrib/completion/git-completion.bash | diff1 | | diff2 | | blob | history |