Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'sg/merge-options' (early part)
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)
* '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
raw
(from:
ca1c991
)
No differences found