granicus.if.org Git - git/commit

]> granicus.if.org Git - git/commit

author	Vincent van Ravesteijn <vfr@lyx.org>
	Fri, 15 Apr 2011 08:34:03 +0000 (10:34 +0200)
committer	Junio C Hamano <gitster@pobox.com>
	Fri, 15 Apr 2011 17:13:52 +0000 (10:13 -0700)
commit	5729482429725c4688c678701ca5197eaf367a07
tree	391dfe32a96dcfce90e12e337ee9b11928e46a67	tree \| snapshot
parent	810cae53e0f622d6804f063c04a83dbc3a11b7ca	commit \| diff

Documentation: update to git-merge-base --octopus

Unlike plain merge-base, merge-base --octopus only requires at least one
commit argument; update the synopsis to reflect that.

Add a sentence to the discussion that when --octopus is used, we do expect
'2' (the common ansestor across all) as the result.

Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation/git-merge-base.txt		diff \| blob \| history
builtin/merge-base.c		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom