summaryrefslogtreecommitdiff
path: root/upload-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-10-21 16:26:42 -0700
committerJunio C Hamano <gitster@pobox.com>2010-10-21 16:26:42 -0700
commitf7bff60de95951d2c82601350cb3771b347e83ee (patch)
tree5c0e747a86d4990b4e5b7176cec670de620dabe8 /upload-pack.c
parent75a2f301676aefb85c4f67da613cad2405e77927 (diff)
parentd0bb13663000be47d83cbe53b6c4bdc8835625cb (diff)
downloadgit-f7bff60de95951d2c82601350cb3771b347e83ee.tar.gz
Merge branch 'sn/doc-opt-notation' into maint
* sn/doc-opt-notation: Fix {update,checkout}-index usage strings Put a space between `<' and argument in pack-objects usage string Remove stray quotes in --pretty and --format documentation Use parentheses and `...' where appropriate Fix odd markup in --diff-filter documentation Use angles for placeholders consistently
Diffstat (limited to 'upload-pack.c')
-rw-r--r--upload-pack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/upload-pack.c b/upload-pack.c
index 92f9530c65..f05e4229d0 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -11,7 +11,7 @@
#include "list-objects.h"
#include "run-command.h"
-static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=nn] <dir>";
+static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=<n>] <dir>";
/* bits #0..7 in revision.h, #8..10 in commit.c */
#define THEY_HAVE (1u << 11)