Merge branch 'jc/diff'

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

index d476518..0991d5f 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -4,19 +4,19 @@
  #
  # Fetch one or more remote refs and merge it/them into the current HEAD.
  
-. git-sh-setup || die "Not a git archive"
+USAGE='[-n | --no-summary] [--no-commit] [-s strategy]... [<fetch-options>] <repo> <head>...'
+LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.'
+. git-sh-setup
  
-usage () {
-    die "git pull [-n] [-s strategy]... <repo> <head>..."
-}
-
-strategy_args= no_summary=
+strategy_args= no_summary= no_commit=
  while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac
  do
         case "$1" in
         -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
                 --no-summa|--no-summar|--no-summary)
                 no_summary=-n ;;
+       --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
+               no_commit=--no-commit ;;
         -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
                 --strateg=*|--strategy=*|\
         -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
@@ -31,6 +31,9 @@ do
                 esac
                 strategy_args="${strategy_args}-s $strategy "
                 ;;
+       -h|--h|--he|--hel|--help)
+               usage
+               ;;
         -*)
                 # Pass thru anything that is meant for fetch.
                 break
@@ -67,10 +70,22 @@ case "$merge_head" in
         exit 0
         ;;
  ?*' '?*)
-       strategy_default_args='-s octopus'
+       var=`git-var -l | sed -ne 's/^pull\.octopus=/-s /p'`
+       if test '' = "$var"
+       then
+               strategy_default_args='-s octopus'
+       else
+               strategy_default_args=$var
+       fi
         ;;
  *)
-       strategy_default_args='-s resolve'
+       var=`git-var -l | sed -ne 's/^pull\.twohead=/-s /p'`
+       if test '' = "$var"
+       then
+               strategy_default_args='-s recursive'
+       else
+               strategy_default_args=$var
+       fi
         ;;
  esac
  
@@ -81,4 +96,4 @@ case "$strategy_args" in
  esac
  
  merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD")
-git-merge $no_summary $strategy_args "$merge_name" HEAD $merge_head
+git-merge $no_summary $no_commit $strategy_args "$merge_name" HEAD $merge_head