git.tremily.us Git - git.git/commit

author	Junio C Hamano <gitster@pobox.com>
	Tue, 10 Nov 2009 20:32:59 +0000 (12:32 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Tue, 10 Nov 2009 20:32:59 +0000 (12:32 -0800)
commit	3cc335181fdeba6cb25e9a6e55217b2e8d18e6b1
tree	42fc1b67e7237c5c3913004c53bc8c14dea479c8	tree \| snapshot
parent	740b6ad75bbe0cd0c3f4be30f0380814878ac445	commit \| diff
parent	134748353b2a71a34f899c9b1326ccf7ae082412	commit \| diff

Merge branch 'bg/merge-ff-only'

* bg/merge-ff-only:
Teach 'git merge' and 'git pull' the option --ff-only

Git—the stupid content tracker

Documentation/merge-options.txt	diff1 \|	diff2 \|	blob \| history
builtin-merge.c	diff1 \|	diff2 \|	blob \| history