projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge-recursive: conflicting rename case.
[git.git]
/
pack-objects.c
diff --git
a/pack-objects.c
b/pack-objects.c
index
a62c9f8
..
caf3b6b
100644
(file)
--- a/
pack-objects.c
+++ b/
pack-objects.c
@@
-4,7
+4,7
@@
#include "pack.h"
#include "csum-file.h"
#include "pack.h"
#include "csum-file.h"
-static const char pack_usage[] = "git-pack-objects [--local] [--incremental] [--window=N] [--depth=N] {--stdout | base-name} < object-list";
+static const char pack_usage[] = "git-pack-objects [--
non-empty] [--
local] [--incremental] [--window=N] [--depth=N] {--stdout | base-name} < object-list";
struct object_entry {
unsigned char sha1[20];
struct object_entry {
unsigned char sha1[20];