diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-10-01 01:59:53 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-01 01:59:53 +0400 |
| commit | 1e633418479926bc85ed21a4f91c845a3dd3ad66 (patch) | |
| tree | abcd420c9b200b22e4c62065b2b4db089c091a50 /builtin | |
| parent | 9855b08d35edf8a8a441f24ff7b00e220a29f261 (diff) | |
| parent | 8695353147e0c20fc8197fd73efec2ca9bce0304 (diff) | |
Merge branch 'maint'
* maint:
Fix typo in pack-objects' usage
Make sure that git_getpass() never returns NULL
t0004 (unwritable files): simplify error handling
rev-list-options: clarify --parents and --children
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/pack-objects.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 0e81673118..3756cf36ee 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -30,7 +30,7 @@ static const char pack_usage[] = " [--no-reuse-delta] [--no-reuse-object] [--delta-base-offset]\n" " [--threads=N] [--non-empty] [--revs [--unpacked | --all]*]\n" " [--reflog] [--stdout | base-name] [--include-tag]\n" - " [--keep-unreachable | --unpack-unreachable \n" + " [--keep-unreachable | --unpack-unreachable]\n" " [<ref-list | <object-list]"; struct object_entry { |