summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Paul Mackerras <paulus@samba.org>2013-01-02 15:25:29 +1100
committerLibravatar Paul Mackerras <paulus@samba.org>2013-01-02 15:25:29 +1100
commit386befb773e2b4a7cc31135f22555e27597392c1 (patch)
treeaeb7ef7d9722d320eae49c8752484b2035a944e6 /Documentation/merge-strategies.txt
parentgitk: Improve display of list of nearby tags and heads (diff)
downloadtgif-386befb773e2b4a7cc31135f22555e27597392c1.tar.xz
gitk: Display important heads even when there are many
When there are more than $maxrefs descendant heads to display in the Branches field of the commit display, we currently just display "many", which is not very informative. To make the display more informative, we now look for "master" and whichever head is currently checked out, and display them even if there are too many heads to display them all. The display then looks like "Branches: master and many more (33)" for instance. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions