summaryrefslogtreecommitdiff
path: root/t/t3200-branch.sh
diff options
context:
space:
mode:
authorKjetil Barvik <barvik@broadpark.no>2009-03-04 17:47:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-03-05 04:36:24 (GMT)
commit19de5d6913b9681d2bde533bccc8445c9236a648 (patch)
tree9f060a243b359646f9394cfff03776e4399cf86b /t/t3200-branch.sh
parenta95148dea1d9546e96adef7c3cad11be80aa30f5 (diff)
downloadgit-19de5d6913b9681d2bde533bccc8445c9236a648.zip
git-19de5d6913b9681d2bde533bccc8445c9236a648.tar.gz
git-19de5d6913b9681d2bde533bccc8445c9236a648.tar.bz2
stat_tracking_info(): only count real commits
stat_tracking_info() in remote.c is used to collect the statistics to be able to say (for instance) from the output of "git checkout': Your branch and 'foo' have diverged, and have X and Y different commit(s) each, respectively. Currently X and Y also includes the count of merges. This patch excludes the merges from being counted. Signed-off-by: Kjetil Barvik <barvik@broadpark.no> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3200-branch.sh')
0 files changed, 0 insertions, 0 deletions