summaryrefslogtreecommitdiff
path: root/builtin-blame.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-09-03 14:51:56 -0700
committerJunio C Hamano <gitster@pobox.com>2008-09-03 14:51:56 -0700
commit36f44a06802960abce7febbf9cc40461e5546ee5 (patch)
treed0001f04f2edfb3644c304626908f31d495cb17b /builtin-blame.c
parent73bae1dc468734bad3ff7d1b8e93e7ac5f9d3dff (diff)
parent47a528ad24185133867ebb5bb7692db2cb8bef39 (diff)
downloadgit-36f44a06802960abce7febbf9cc40461e5546ee5.tar.gz
Merge branch 'ho/dashless' into maint
* ho/dashless: tests: use "git xyzzy" form (t7200 - t9001) tests: use "git xyzzy" form (t7000 - t7199) tests: use "git xyzzy" form (t3600 - t6999) tests: use "git xyzzy" form (t0000 - t3599) 'git foo' program identifies itself without dash in die() messages Start conforming code to "git subcmd" style
Diffstat (limited to 'builtin-blame.c')
-rw-r--r--builtin-blame.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-blame.c b/builtin-blame.c
index 4ea343189f..d2fc68c68a 100644
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -1791,7 +1791,7 @@ static int prepare_lines(struct scoreboard *sb)
/*
* Add phony grafts for use with -S; this is primarily to
- * support git-cvsserver that wants to give a linear history
+ * support git's cvsserver that wants to give a linear history
* to its clients.
*/
static int read_ancestry(const char *graft_file)