summaryrefslogtreecommitdiff
path: root/git-relink.perl
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 /git-relink.perl
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 'git-relink.perl')
-rwxr-xr-xgit-relink.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-relink.perl b/git-relink.perl
index 937c69a748..c2a0ef8d5a 100755
--- a/git-relink.perl
+++ b/git-relink.perl
@@ -163,7 +163,7 @@ sub link_two_files($$) {
sub usage() {
- print("Usage: git relink [--safe] <dir> [<dir> ...] <master_dir> \n");
+ print("Usage: git relink [--safe] <dir>... <master_dir> \n");
print("All directories should contain a .git/objects/ subdirectory.\n");
print("Options\n");
print("\t--safe\t" .