diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-16 01:24:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-16 01:24:58 -0700 |
| commit | 97d7fee2cb068f215a593c6e5623b265db45d3bc (patch) | |
| tree | 6179e15deb7b34d3d2c6236077e7ad8454457942 /builtin-rm.c | |
| parent | 132c6e443cb76d0baf9eece7b9424d25dc83a91d (diff) | |
| parent | 1f5a892e5209be329dda316edb0341066d62e3eb (diff) | |
| download | git-97d7fee2cb068f215a593c6e5623b265db45d3bc.tar.gz | |
Merge branch 'maint'
* maint:
Cosmetical command name fix
Start conforming code to "git subcmd" style part 3
t9700/test.pl: remove File::Temp requirement
t9700/test.pl: avoid bareword 'STDERR' in 3-argument open()
Diffstat (limited to 'builtin-rm.c')
| -rw-r--r-- | builtin-rm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-rm.c b/builtin-rm.c index 6bd82111d2..fdac34f242 100644 --- a/builtin-rm.c +++ b/builtin-rm.c @@ -104,7 +104,7 @@ static int check_local_mod(unsigned char *head, int index_only) "from both the file and the HEAD\n" "(use -f to force removal)", name); else if (!index_only) { - /* It's not dangerous to git-rm --cached a + /* It's not dangerous to "git rm --cached" a * file if the index matches the file or the * HEAD, since it means the deleted content is * still available somewhere. |