summaryrefslogtreecommitdiff
path: root/Documentation/callouts.xsl
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <Johannes.Schindelin@gmx.de>2007-08-27 12:37:33 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-08-27 22:36:43 -0700
commitac076c29ae8d57b72abe27f573061ea7b2eeed57 (patch)
tree4b3d9e4fa5dfd9f7e986e366a7fe0e70a5e886cb /Documentation/callouts.xsl
parentDescribe two-dot and three-dot notation for diff endpoints. (diff)
downloadtgif-ac076c29ae8d57b72abe27f573061ea7b2eeed57.tar.xz
name-rev: Fix non-shortest description
Uwe Kleine-König noticed that under certain circumstances, name-rev picked a non-optimal tag. Jeff King analyzed that name-rev only takes into account the number of merge traversals, and then the _last_ number in the description. As an easy way to fix it, use a weighting factor for merge traversals: A merge traversal is now made 65535 times more expensive than a first-parent traversal. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Acked-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/callouts.xsl')
0 files changed, 0 insertions, 0 deletions