diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-03 14:51:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-03 14:51:56 -0700 |
| commit | 36f44a06802960abce7febbf9cc40461e5546ee5 (patch) | |
| tree | d0001f04f2edfb3644c304626908f31d495cb17b /builtin-rm.c | |
| parent | 73bae1dc468734bad3ff7d1b8e93e7ac5f9d3dff (diff) | |
| parent | 47a528ad24185133867ebb5bb7692db2cb8bef39 (diff) | |
| download | git-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-rm.c')
| -rw-r--r-- | builtin-rm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-rm.c b/builtin-rm.c index 0ed26bb8f1..6bd82111d2 100644 --- a/builtin-rm.c +++ b/builtin-rm.c @@ -221,7 +221,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix) printf("rm '%s'\n", path); if (remove_file_from_cache(path)) - die("git-rm: unable to remove %s", path); + die("git rm: unable to remove %s", path); } if (show_only) @@ -244,7 +244,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix) continue; } if (!removed) - die("git-rm: %s: %s", path, strerror(errno)); + die("git rm: %s: %s", path, strerror(errno)); } } |