aboutsummaryrefslogtreecommitdiff
path: root/remote.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-09-10 17:08:22 +0900
committerJunio C Hamano <gitster@pobox.com>2017-09-10 17:08:22 +0900
commit8e36002adda45a35c6fc4daf81913c3d2102cb59 (patch)
treee3640ac0242262814f2b2d4c2a01c4332faeb18c /remote.c
parenta48ce378585054f2ae3b2f0e18346ab005290524 (diff)
parent7560f547e614244fe1d4648598d4facf7ed33a56 (diff)
downloadgit-8e36002adda45a35c6fc4daf81913c3d2102cb59.tar.gz
git-8e36002adda45a35c6fc4daf81913c3d2102cb59.tar.xz
Merge branch 'ma/up-to-date'
Message and doc updates. * ma/up-to-date: treewide: correct several "up-to-date" to "up to date" Documentation/user-manual: update outdated example output
Diffstat (limited to 'remote.c')
-rw-r--r--remote.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/remote.c b/remote.c
index 43c317e4e..411309006 100644
--- 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,