Merge branch 'master' into js/fmt-patch

* master: (119 commits)
  diff family: add --check option
  Document that "git add" only adds non-ignored files.
  Add a conversion tool to migrate remote information into the config
  fetch, pull: ask config for remote information
  Fix build procedure for builtin-init-db
  read-tree -m -u: do not overwrite or remove untracked working tree files.
  apply --cached: do not check newly added file in the working tree
  Implement a --dry-run option to git-quiltimport
  Implement git-quiltimport
  Revert "builtin-grep: workaround for non GNU grep."
  builtin-grep: workaround for non GNU grep.
  builtin-grep: workaround for non GNU grep.
  git-am: use apply --cached
  apply --cached: apply a patch without using working tree.
  apply --numstat: show new name, not old name.
  Documentation/Makefile: create tarballs for the man pages and html files
  Allow pickaxe and diff-filter options to be used by git log.
  Libify the index refresh logic
  Builtin git-init-db
  Remove unnecessary local in get_ref_sha1.
  ...

1 files changed, 0 insertions, 62 deletions

diff --git a/git-grep.sh b/git-grep.sh
deleted file mode 100755
index ad4f2fe810..0000000000
--- a/git-grep.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) Linus Torvalds, 2005
-#
-
-USAGE='[<option>...] [-e] <pattern> [<path>...]'
-SUBDIRECTORY_OK='Yes'
-. git-sh-setup
-
-got_pattern () {
-	if [ -z "$no_more_patterns" ]
-	then
-		pattern="$1" no_more_patterns=yes
-	else
-		die "git-grep: do not specify more than one pattern"
-	fi
-}
-
-no_more_patterns=
-pattern=
-flags=()
-git_flags=()
-while : ; do
-	case "$1" in
-	-o|--cached|--deleted|--others|--killed|\
-	--ignored|--modified|--exclude=*|\
-	--exclude-from=*|\--exclude-per-directory=*)
-		git_flags=("${git_flags[@]}" "$1")
-		;;
-	-e)
-		got_pattern "$2"
-		shift
-		;;
-	-A|-B|-C|-D|-d|-f|-m)
-		flags=("${flags[@]}" "$1" "$2")
-		shift
-		;;
-	--)
-		# The rest are git-ls-files paths
-		shift
-		break
-		;;
-	-*)
-		flags=("${flags[@]}" "$1")
-		;;
-	*)
-		if [ -z "$no_more_patterns" ]
-		then
-			got_pattern "$1"
-			shift
-		fi
-		[ "$1" = -- ] && shift
-		break
-		;;
-	esac
-	shift
-done
-[ "$pattern" ] || {
-	usage
-}
-git-ls-files -z "${git_flags[@]}" -- "$@" |
-	xargs -0 grep "${flags[@]}" -e "$pattern" --