author | Kjetil Barvik <barvik@broadpark.no> | |
Wed, 4 Mar 2009 17:47:39 +0000 (18:47 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 5 Mar 2009 04:36:24 +0000 (20:36 -0800) | ||
commit | 19de5d6913b9681d2bde533bccc8445c9236a648 | |
tree | 9f060a243b359646f9394cfff03776e4399cf86b | tree | snapshot |
parent | a95148dea1d9546e96adef7c3cad11be80aa30f5 | commit | diff |
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>
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>
remote.c | diff | blob | history |