Public Git Hosting - git/gitweb-caching.git/commit

commit	456db36a22eb7eac549436db29ab034616fbe45e
author	Junio C Hamano <gitster@pobox.com>
	Mon, 18 Aug 2008 00:08:00 +0000 (17 17:08 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Mon, 18 Aug 2008 00:08:00 +0000 (17 17:08 -0700)
tree	09574fb86e8664c796ee775608a48e234211b7b9	tree \| snapshot (tar.gz zip)
parent	d38bbd738326ec38a3992ac1e237e637407ff272	commit \| diff
parent	56d8d66e84aa4a2048f6552bb66a015a8e6f51ce	commit \| diff

Merge branch 'sg/merge-options' into next

* sg/merge-options:
merge: remove deprecated summary and diffstat options and config variables

Conflicts:
Documentation/git-fmt-merge-msg.txt
Documentation/merge-options.txt
builtin-fmt-merge-msg.c
t/t6200-fmt-merge-msg.sh

Documentation/git-fmt-merge-msg.txt	diff1 \|	diff2 \|	blob \| history
builtin-fmt-merge-msg.c	diff1 \|	diff2 \|	blob \| history
contrib/examples/git-merge.sh	diff1 \|	diff2 \|	blob \| history
git-pull.sh	diff1 \|	diff2 \|	blob \| history
t/t6200-fmt-merge-msg.sh	diff1 \|	diff2 \|	blob \| history
t/t7600-merge.sh	diff1 \|	diff2 \|	blob \| history

Gitweb caching

RSS Atom

Documentation/git-fmt-merge-msg.txt	diff1 \|	diff2 \|	blob \| history
builtin-fmt-merge-msg.c	diff1 \|	diff2 \|	blob \| history
contrib/examples/git-merge.sh	diff1 \|	diff2 \|	blob \| history
git-pull.sh	diff1 \|	diff2 \|	blob \| history
t/t6200-fmt-merge-msg.sh	diff1 \|	diff2 \|	blob \| history
t/t7600-merge.sh	diff1 \|	diff2 \|	blob \| history