Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
help: make option --help open man pages only for Git commands
[gitweb.git]
/
remote.c
diff --git
a/remote.c
b/remote.c
index ddc4f8fd4801f2ab211340d25d2528affa50a352..a326e4e2516e2129e7a08bfc149786402ec160fb 100644
(file)
--- a/
remote.c
+++ b/
remote.c
@@
-2108,7
+2108,7
@@
int format_tracking_info(struct branch *branch, struct strbuf *sb)
"Your branch and '%s' have diverged,\n"
"and have %d and %d different commits each, "
"respectively.\n",
- theirs),
+
ours +
theirs),
base, ours, theirs);
if (advice_status_hints)
strbuf_addf(sb,