ls-files: --others should not say unmerged paths are unknown.
[gitweb.git] / git-pull.sh
index 96016270b4a1746ac1f075ed9fbcf62e754005e8..e23d4f559790fed079bb5759fd5aa11a8804f191 100755 (executable)
@@ -7,7 +7,7 @@
 . git-sh-setup || die "Not a git archive"
 
 usage () {
-    die "git pull [-n] [-s strategy]... <repo> <head>..."
+    die "git pull [-n] [--no-commit] [-s strategy]... <repo> <head>..."
 }
 
 strategy_args= no_summary= no_commit=