summaryrefslogtreecommitdiff
path: root/t/t4034
diff options
context:
space:
mode:
authorLibravatar Vincent van Ravesteijn <vfr@lyx.org>2011-04-15 10:34:03 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-04-15 10:13:52 -0700
commit5729482429725c4688c678701ca5197eaf367a07 (patch)
tree391dfe32a96dcfce90e12e337ee9b11928e46a67 /t/t4034
parentarchive: document limitation of tar.umask config setting (diff)
downloadtgif-5729482429725c4688c678701ca5197eaf367a07.tar.xz
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>
Diffstat (limited to 't/t4034')
0 files changed, 0 insertions, 0 deletions