Merge branch 'bc/reflog-fix' into js/reflog-delete

* bc/reflog-fix: (1490 commits)
  builtin-reflog.c: don't install new reflog on write failure
  hash: fix lookup_hash semantics
  gitweb: Better chopping in commit search results
  builtin-tag.c: remove cruft
  git-merge-index documentation: clarify synopsis
  send-email: fix In-Reply-To regression
  git-reset --hard and git-read-tree --reset: fix read_cache_unmerged()
  Teach git-grep --name-only as synonym for -l
  diff: fix java funcname pattern for solaris
  t3404: use configured shell instead of /bin/sh
  git_config_*: don't assume we are parsing a config file
  prefix_path: use is_absolute_path() instead of *orig == '/'
  git-clean: handle errors if removing files fails
  Clarified the meaning of git-add -u in the documentation
  git-clone.sh: properly configure remote even if remote's head is dangling
  git.el: Set process-environment instead of invoking env
  Documentation/git-stash: document options for git stash list
  send-email: squelch warning due to comparing undefined $_ to ""
  cvsexportcommit: be graceful when "cvs status" reorders the arguments
  Rename git-core rpm to just git and rename the meta-pacakge to git-all.
  ...

Conflicts:

	Documentation/git-reflog.txt
	t/t1410-reflog.sh

1 files changed, 0 insertions, 99 deletions

diff --git a/git-clean.sh b/git-clean.sh
deleted file mode 100755
index 4491738186..0000000000
--- a/git-clean.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2005-2006 Pavel Roskin
-#
-
-USAGE="[-d] [-f] [-n] [-q] [-x | -X] [--] <paths>..."
-LONG_USAGE='Clean untracked files from the working directory
-	-d	remove directories as well
-	-f	override clean.requireForce and clean anyway
-	-n 	don'\''t remove anything, just show what would be done
-	-q	be quiet, only report errors
-	-x	remove ignored files as well
-	-X	remove only ignored files
-When optional <paths>... arguments are given, the paths
-affected are further limited to those that match them.'
-SUBDIRECTORY_OK=Yes
-. git-sh-setup
-require_work_tree
-
-ignored=
-ignoredonly=
-cleandir=
-disabled="`git config --bool clean.requireForce`"
-rmf="rm -f --"
-rmrf="rm -rf --"
-rm_refuse="echo Not removing"
-echo1="echo"
-
-while test $# != 0
-do
-	case "$1" in
-	-d)
-		cleandir=1
-		;;
-	-f)
-		disabled=
-		;;
-	-n)
-		disabled=
-		rmf="echo Would remove"
-		rmrf="echo Would remove"
-		rm_refuse="echo Would not remove"
-		echo1=":"
-		;;
-	-q)
-		echo1=":"
-		;;
-	-x)
-		ignored=1
-		;;
-	-X)
-		ignoredonly=1
-		;;
-	--)
-		shift
-		break
-		;;
-	-*)
-		usage
-		;;
-	*)
-		break
-	esac
-	shift
-done
-
-if [ "$disabled" = true ]; then
-	echo "clean.requireForce set and -n or -f not given; refusing to clean"
-	exit 1
-fi
-
-case "$ignored,$ignoredonly" in
-	1,1) usage;;
-esac
-
-if [ -z "$ignored" ]; then
-	excl="--exclude-per-directory=.gitignore"
-	if [ -f "$GIT_DIR/info/exclude" ]; then
-		excl_info="--exclude-from=$GIT_DIR/info/exclude"
-	fi
-	if [ "$ignoredonly" ]; then
-		excl="$excl --ignored"
-	fi
-fi
-
-git ls-files --others --directory $excl ${excl_info:+"$excl_info"} -- "$@" |
-while read -r file; do
-	if [ -d "$file" -a ! -L "$file" ]; then
-		if [ -z "$cleandir" ]; then
-			$rm_refuse "$file"
-			continue
-		fi
-		$echo1 "Removing $file"
-		$rmrf "$file"
-	else
-		$echo1 "Removing $file"
-		$rmf "$file"
-	fi
-done