Junio C Hamano ec845695c4 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		2008-05-03 13:18:20 -07:00
..
git-completion.bash	Merge commit 'sg/merge-options^' into jk/renamelimit	2008-05-03 13:18:20 -07:00