summaryrefslogtreecommitdiff
path: root/builtin-update-index.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-09-16 01:24:58 -0700
committerJunio C Hamano <gitster@pobox.com>2008-09-16 01:24:58 -0700
commit97d7fee2cb068f215a593c6e5623b265db45d3bc (patch)
tree6179e15deb7b34d3d2c6236077e7ad8454457942 /builtin-update-index.c
parent132c6e443cb76d0baf9eece7b9424d25dc83a91d (diff)
parent1f5a892e5209be329dda316edb0341066d62e3eb (diff)
downloadgit-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-update-index.c')
-rw-r--r--builtin-update-index.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin-update-index.c b/builtin-update-index.c
index ce83224756..417f9724ab 100644
--- a/builtin-update-index.c
+++ b/builtin-update-index.c
@@ -14,7 +14,7 @@
* Default to not allowing changes to the list of files. The
* tool doesn't actually care, but this makes it harder to add
* files to the revision control by mistake by doing something
- * like "git-update-index *" and suddenly having all the object
+ * like "git update-index *" and suddenly having all the object
* files be revision controlled.
*/
static int allow_add;
@@ -313,18 +313,18 @@ static void read_index_info(int line_termination)
/* This reads lines formatted in one of three formats:
*
* (1) mode SP sha1 TAB path
- * The first format is what "git-apply --index-info"
+ * The first format is what "git apply --index-info"
* reports, and used to reconstruct a partial tree
* that is used for phony merge base tree when falling
* back on 3-way merge.
*
* (2) mode SP type SP sha1 TAB path
- * The second format is to stuff git-ls-tree output
+ * The second format is to stuff "git ls-tree" output
* into the index file.
*
* (3) mode SP sha1 SP stage TAB path
* This format is to put higher order stages into the
- * index file and matches git-ls-files --stage output.
+ * index file and matches "git ls-files --stage" output.
*/
errno = 0;
ul = strtoul(buf.buf, &ptr, 8);