diff options
| author | Petr Baudis <pasky@ucw.cz> | 2005-05-11 02:00:49 +0200 |
|---|---|---|
| committer | Petr Baudis <xpasky@machine.sinus.cz> | 2005-05-11 02:00:49 +0200 |
| commit | f1a7eb36b017c62d9a007b6b8660bdeec3f94f97 (patch) | |
| tree | 9d9c288e2db202401ffba37a1b921f4244a79b2b /diff-cache.c | |
| parent | 883550481f885ab2865ab71819167230d21d4c14 (diff) | |
| parent | b790abb874890926e4cfda552bfa89d1d4ff972b (diff) | |
| download | git-f1a7eb36b017c62d9a007b6b8660bdeec3f94f97.tar.gz | |
Merge with http://members.cox.net/junkio/git-jc.git
Diffstat (limited to 'diff-cache.c')
| -rw-r--r-- | diff-cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-cache.c b/diff-cache.c index 7e87d28f3a..84527190fe 100644 --- a/diff-cache.c +++ b/diff-cache.c @@ -165,7 +165,7 @@ static void mark_merge_entries(void) } static char *diff_cache_usage = -"diff-cache [-r] [-z] [-p] [-i] [--cached] <tree sha1>"; +"git-diff-cache [-p] [-r] [-z] [-m] [--cached] <tree sha1>"; int main(int argc, char **argv) { |