diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-04-05 01:17:08 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-04-05 01:17:08 -0700 |
commit | 81aa96497686bd31c5a9a3cdf110c2e10c799c03 (patch) | |
tree | 58e9c7e1f74d2d002ca8cc0c59eec8ade805f9f5 /git-submodule.sh | |
parent | tests: remove exit after test_done call (diff) | |
parent | git submodule: fix usage line (diff) | |
download | tgif-81aa96497686bd31c5a9a3cdf110c2e10c799c03.tar.xz |
Merge branch 'maint'
* maint:
git submodule: fix usage line
doc/git-pack-refs: fix two grammar issues
commit: abort commit if interactive add failed
git-repack: use non-dashed update-server-info
Diffstat (limited to 'git-submodule.sh')
-rwxr-xr-x | git-submodule.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 0a27232b90..7c2e060ae7 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -5,7 +5,7 @@ # Copyright (c) 2007 Lars Hjemli USAGE="[--quiet] [--cached] \ -[add <repo> [-b branch] <path>]|[status|init|update [-i|--init] [-N|--no-fetch]|summary [-n|--summary-limit <n>] [<commit>]] \ +[add [-b branch] <repo> <path>]|[status|init|update [-i|--init] [-N|--no-fetch]|summary [-n|--summary-limit <n>] [<commit>]] \ [--] [<path>...]|[foreach <command>]|[sync [--] [<path>...]]" OPTIONS_SPEC= . git-sh-setup |