Refactored merge options into separate merge-options.txt.

[git.git] / git-pull.sh
diff --git a/git-pull.sh b/git-pull.sh

old mode 100755 (executable)

new mode 100644 (file)

index e23d4f5..2358af6
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -7,7 +7,14 @@
  . git-sh-setup || die "Not a git archive"
  
  usage () {
-    die "git pull [-n] [--no-commit] [-s strategy]... <repo> <head>..."
+    echo >&2 "usage: $0"' [-n] [--no-commit] [--no-summary] [--help]
+    [-s strategy]...
+    [<fetch-options>]
+    <repo> <head>...
+
+Fetch one or more remote refs and merge it/them into the current HEAD.
+'
+    exit 1
  }
  
  strategy_args= no_summary= no_commit=
@@ -33,6 +40,9 @@ do
                 esac
                 strategy_args="${strategy_args}-s $strategy "
                 ;;
+       -h|--h|--he|--hel|--help)
+               usage
+               ;;
         -*)
                 # Pass thru anything that is meant for fetch.
                 break