diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-03 13:18:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-03 13:18:20 -0700 |
| commit | ec845695c4e6d7b689c3eb0b53d1b2ba4803c7ea (patch) | |
| tree | b02046a790e4a291d96042ea308841926c61c937 /builtin-merge-recursive.c | |
| parent | Merge branch 'maint' (diff) | |
| parent | merge, pull: add '--(no-)log' command line option (diff) | |
| download | git-ec845695c4e6d7b689c3eb0b53d1b2ba4803c7ea.tar.gz git-ec845695c4e6d7b689c3eb0b53d1b2ba4803c7ea.zip | |
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
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions