Sync with GIT 1.5.3.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --combined Documentation/config.txt
index 015910f27a450cdaec80f3bfc2679243126736c0,7ee97df8a70cd6c6b127d7d32f5e325acc405c98..f59fbb30248d9ac1f8e0d44364957359a3f152cb
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -579,7 -579,7 +579,7 @@@ merge.summary:
  
  merge.tool::
        Controls which merge resolution program is used by
-       gitlink:git-mergetool[l].  Valid values are: "kdiff3", "tkdiff",
+       gitlink:git-mergetool[1].  Valid values are: "kdiff3", "tkdiff",
        "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and "opendiff".
  
  merge.verbosity::
@@@ -630,17 -630,9 +630,17 @@@ pack.deltaCacheSize:
        A value of 0 means no limit. Defaults to 0.
  
  pack.deltaCacheLimit::
 -      The maxium size of a delta, that is cached in
 +      The maximum size of a delta, that is cached in
        gitlink:git-pack-objects[1]. Defaults to 1000.
  
 +pack.threads::
 +      Specifies the number of threads to spawn when searching for best
 +      delta matches.  This requires that gitlink:git-pack-objects[1]
 +      be compiled with pthreads otherwise this option is ignored with a
 +      warning. This is meant to reduce packing time on multiprocessor
 +      machines. The required amount of memory for the delta search window
 +      is however multiplied by the number of threads.
 +
  pull.octopus::
        The default merge strategy to use when pulling multiple branches
        at once.

diff --combined git-commit.sh
index cb14f0621651d2006b08d1eddf67ab3269df84d0,ab43217be4b49ce71ffee461569e0e4b395dfb5d..c3b881bfadd7ca20d9e14ab6f1c53a9c365fca72
--- 1/git-commit.sh
--- 2/git-commit.sh
+++ b/git-commit.sh
@@@ -25,6 -25,7 +25,7 @@@ refuse_partial () 
        exit 1
  }
  
+ TMP_INDEX=
  THIS_INDEX="$GIT_DIR/index"
  NEXT_INDEX="$GIT_DIR/next-index$$"
  rm -f "$NEXT_INDEX"
@@@ -98,71 -99,101 +99,71 @@@ d
                no_edit=t
                log_given=t$log_given
                logfile="$1"
 -              shift
                ;;
        -F*|-f*)
                no_edit=t
                log_given=t$log_given
 -              logfile=`expr "z$1" : 'z-[Ff]\(.*\)'`
 -              shift
 +              logfile="${1#-[Ff]}"
                ;;
        --F=*|--f=*|--fi=*|--fil=*|--file=*)
                no_edit=t
                log_given=t$log_given
 -              logfile=`expr "z$1" : 'z-[^=]*=\(.*\)'`
 -              shift
 +              logfile="${1#*=}"
                ;;
        -a|--a|--al|--all)
                all=t
 -              shift
                ;;
        --au=*|--aut=*|--auth=*|--autho=*|--author=*)
 -              force_author=`expr "z$1" : 'z-[^=]*=\(.*\)'`
 -              shift
 +              force_author="${1#*=}"
                ;;
        --au|--aut|--auth|--autho|--author)
                case "$#" in 1) usage ;; esac
                shift
                force_author="$1"
 -              shift
                ;;
        -e|--e|--ed|--edi|--edit)
                edit_flag=t
 -              shift
                ;;
        -i|--i|--in|--inc|--incl|--inclu|--includ|--include)
                also=t
 -              shift
                ;;
        --int|--inte|--inter|--intera|--interac|--interact|--interacti|\
        --interactiv|--interactive)
                interactive=t
 -              shift
                ;;
        -o|--o|--on|--onl|--only)
                only=t
 -              shift
                ;;
        -m|--m|--me|--mes|--mess|--messa|--messag|--message)
                case "$#" in 1) usage ;; esac
                shift
                log_given=m$log_given
 -              if test "$log_message" = ''
 -              then
 -                  log_message="$1"
 -              else
 -                  log_message="$log_message
 +              log_message="${log_message:+${log_message}
  
 -$1"
 -              fi
 +}$1"
                no_edit=t
 -              shift
                ;;
        -m*)
                log_given=m$log_given
 -              if test "$log_message" = ''
 -              then
 -                  log_message=`expr "z$1" : 'z-m\(.*\)'`
 -              else
 -                  log_message="$log_message
 +              log_message="${log_message:+${log_message}
  
 -`expr "z$1" : 'z-m\(.*\)'`"
 -              fi
 +}${1#-m}"
                no_edit=t
 -              shift
                ;;
        --m=*|--me=*|--mes=*|--mess=*|--messa=*|--messag=*|--message=*)
                log_given=m$log_given
 -              if test "$log_message" = ''
 -              then
 -                  log_message=`expr "z$1" : 'z-[^=]*=\(.*\)'`
 -              else
 -                  log_message="$log_message
 +              log_message="${log_message:+${log_message}
  
 -`expr "z$1" : 'zq-[^=]*=\(.*\)'`"
 -              fi
 +}${1#*=}"
                no_edit=t
 -              shift
                ;;
        -n|--n|--no|--no-|--no-v|--no-ve|--no-ver|--no-veri|--no-verif|\
        --no-verify)
                verify=
 -              shift
                ;;
        --a|--am|--ame|--amen|--amend)
                amend=t
                use_commit=HEAD
 -              shift
                ;;
        -c)
                case "$#" in 1) usage ;; esac
@@@ -170,13 -201,15 +171,13 @@@
                log_given=t$log_given
                use_commit="$1"
                no_edit=
 -              shift
                ;;
        --ree=*|--reed=*|--reedi=*|--reedit=*|--reedit-=*|--reedit-m=*|\
        --reedit-me=*|--reedit-mes=*|--reedit-mess=*|--reedit-messa=*|\
        --reedit-messag=*|--reedit-message=*)
                log_given=t$log_given
 -              use_commit=`expr "z$1" : 'z-[^=]*=\(.*\)'`
 +              use_commit="${1#*=}"
                no_edit=
 -              shift
                ;;
        --ree|--reed|--reedi|--reedit|--reedit-|--reedit-m|--reedit-me|\
        --reedit-mes|--reedit-mess|--reedit-messa|--reedit-messag|\
@@@ -186,6 -219,7 +187,6 @@@
                log_given=t$log_given
                use_commit="$1"
                no_edit=
 -              shift
                ;;
        -C)
                case "$#" in 1) usage ;; esac
@@@ -193,13 -227,15 +194,13 @@@
                log_given=t$log_given
                use_commit="$1"
                no_edit=t
 -              shift
                ;;
        --reu=*|--reus=*|--reuse=*|--reuse-=*|--reuse-m=*|--reuse-me=*|\
        --reuse-mes=*|--reuse-mess=*|--reuse-messa=*|--reuse-messag=*|\
        --reuse-message=*)
                log_given=t$log_given
 -              use_commit=`expr "z$1" : 'z-[^=]*=\(.*\)'`
 +              use_commit="${1#*=}"
                no_edit=t
 -              shift
                ;;
        --reu|--reus|--reuse|--reuse-|--reuse-m|--reuse-me|--reuse-mes|\
        --reuse-mess|--reuse-messa|--reuse-messag|--reuse-message)
@@@ -208,26 -244,32 +209,26 @@@
                log_given=t$log_given
                use_commit="$1"
                no_edit=t
 -              shift
                ;;
        -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
                signoff=t
 -              shift
                ;;
        -t|--t|--te|--tem|--temp|--templ|--templa|--templat|--template)
                case "$#" in 1) usage ;; esac
                shift
                templatefile="$1"
                no_edit=
 -              shift
                ;;
        -q|--q|--qu|--qui|--quie|--quiet)
                quiet=t
 -              shift
                ;;
        -v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
                verbose=t
 -              shift
                ;;
        -u|--u|--un|--unt|--untr|--untra|--untrac|--untrack|--untracke|\
        --untracked|--untracked-|--untracked-f|--untracked-fi|--untracked-fil|\
        --untracked-file|--untracked-files)
                untracked_files=t
 -              shift
                ;;
        --)
                shift
@@@ -240,7 -282,6 +241,7 @@@
                break
                ;;
        esac
 +      shift
  done
  case "$edit_flag" in t) no_edit= ;; esac
  
@@@ -401,8 -442,12 +402,8 @@@ esa
  
  if test t = "$verify" && test -x "$GIT_DIR"/hooks/pre-commit
  then
 -      if test "$TMP_INDEX"
 -      then
 -              GIT_INDEX_FILE="$TMP_INDEX" "$GIT_DIR"/hooks/pre-commit
 -      else
 -              GIT_INDEX_FILE="$USE_INDEX" "$GIT_DIR"/hooks/pre-commit
 -      fi || exit
 +    GIT_INDEX_FILE="${TMP_INDEX:-${USE_INDEX}}" "$GIT_DIR"/hooks/pre-commit \
 +    || exit
  fi
  
  if test "$log_message" != ''