Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
connect: split git:// setup into a separate function
[gitweb.git]
/
remote.c
diff --git
a/remote.c
b/remote.c
index 43c317e4e9f6e67aa3e1d0ae245d097bdba664db..41130900698893f46dd18b817a7e6b6485c735a4 100644
(file)
--- a/
remote.c
+++ b/
remote.c
@@
-2084,7
+2084,7
@@
int format_tracking_info(struct branch *branch, struct strbuf *sb)
_(" (use \"git branch --unset-upstream\" to fixup)\n"));
} else if (!ours && !theirs) {
strbuf_addf(sb,
- _("Your branch is up
-to-
date with '%s'.\n"),
+ _("Your branch is up
to
date with '%s'.\n"),
base);
} else if (!theirs) {
strbuf_addf(sb,