![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 3 May 2008 20:18:20 +0000 (13:18 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 3 May 2008 20:18:20 +0000 (13:18 -0700) | ||
| commit | ec845695c4e6d7b689c3eb0b53d1b2ba4803c7ea | |
| tree | b02046a790e4a291d96042ea308841926c61c937 | tree | snapshot |
| parent | e4b9c36ca40a0869ee5fc64aaeabaf2655ef595b | commit | diff |
| parent | efb779f8873e5aa36be29a4e551186c62c1b580c | commit | diff |
Merge commit 'sg/merge-options^' into jk/renamelimit
* commit 'sg/merge-options^':
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
* commit 'sg/merge-options^':
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 |