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-pack-objects.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-pack-objects.c')
| -rw-r--r-- | builtin-pack-objects.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c index ba2cf00f5e..217fd49da9 100644 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@ -23,7 +23,7 @@ #endif static const char pack_usage[] = "\ -git-pack-objects [{ -q | --progress | --all-progress }] \n\ +git pack-objects [{ -q | --progress | --all-progress }] \n\ [--max-pack-size=N] [--local] [--incremental] \n\ [--window=N] [--window-memory=N] [--depth=N] \n\ [--no-reuse-delta] [--no-reuse-object] [--delta-base-offset] \n\ @@ -1872,7 +1872,7 @@ static void mark_in_pack_object(struct object *object, struct packed_git *p, str /* * Compare the objects in the offset order, in order to emulate the - * "git-rev-list --objects" output that produced the pack originally. + * "git rev-list --objects" output that produced the pack originally. */ static int ofscmp(const void *a_, const void *b_) { |