Gecko [ www.jdcpatala.org ]

Name	Size	Permission
buildsystems	[ DIR ]	drwxr-xr-x
coccinelle	[ DIR ]	drwxr-xr-x
contacts	[ DIR ]	drwxr-xr-x
credential	[ DIR ]	drwxr-xr-x
diff-highlight	[ DIR ]	drwxr-xr-x
examples	[ DIR ]	drwxr-xr-x
fast-import	[ DIR ]	drwxr-xr-x
git-jump	[ DIR ]	drwxr-xr-x
git-shell-commands	[ DIR ]	drwxr-xr-x
hg-to-git	[ DIR ]	drwxr-xr-x
hooks	[ DIR ]	drwxr-xr-x
long-running-filter	[ DIR ]	drwxr-xr-x
persistent-https	[ DIR ]	drwxr-xr-x
remote-helpers	[ DIR ]	drwxr-xr-x
stats	[ DIR ]	drwxr-xr-x
subtree	[ DIR ]	drwxr-xr-x
svn-fe	[ DIR ]	drwxr-xr-x
thunderbird-patch-inline	[ DIR ]	drwxr-xr-x
update-unicode	[ DIR ]	drwxr-xr-x
vscode	[ DIR ]	drwxr-xr-x
workdir	[ DIR ]	drwxr-xr-x
README	2.06 KB	-rw-r--r--
coverage-diff.sh	2.05 KB	-rw-r--r--
git-resurrect.sh	4.29 KB	-rw-r--r--
remotes2config.sh	770 B	-rw-r--r--
rerere-train.sh	1.57 KB	-rw-r--r--

Code Editor : rerere-train.sh

#!/bin/sh
# Copyright (c) 2008, Nanako Shiraishi
# Prime rerere database from existing merge commits

me=rerere-train
USAGE=$(cat <<-EOF
usage: $me [--overwrite] <rev-list-args>

-h, --help            show the help
    -o, --overwrite       overwrite any existing rerere cache
EOF
)

SUBDIRECTORY_OK=Yes

overwrite=0

while test $# -gt 0
do
	opt="$1"
	case "$opt" in
	-h|--help)
		echo "$USAGE"
		exit 0
		;;
	-o|--overwrite)
		overwrite=1
		shift
		break
		;;
	--)
		shift
		break
		;;
	*)
		break
		;;
	esac
done

# Overwrite or help options are not valid except as first arg
for opt in "$@"
do
	case "$opt" in
	-h|--help)
		echo "$USAGE"
		exit 0
		;;
	-o|--overwrite)
		echo "$USAGE"
		exit 0
		;;
	esac
done

. "$(git --exec-path)/git-sh-setup"
require_work_tree
cd_to_toplevel

# Remember original branch
branch=$(git symbolic-ref -q HEAD) ||
original_HEAD=$(git rev-parse --verify HEAD) || {
	echo >&2 "Not on any branch and no commit yet?"
	exit 1
}

mkdir -p "$GIT_DIR/rr-cache" || exit

git rev-list --parents "$@" |
while read commit parent1 other_parents
do
	if test -z "$other_parents"
	then
		# Skip non-merges
		continue
	fi
	git checkout -q "$parent1^0"
	if git merge $other_parents >/dev/null 2>&1
	then
		# Cleanly merges
		continue
	fi
	if test $overwrite = 1
	then
		git rerere forget .
	fi
	if test -s "$GIT_DIR/MERGE_RR"
	then
		git show -s --pretty=format:"Learning from %h %s" "$commit"
		git rerere
		git checkout -q $commit -- .
		git rerere
	fi
	git reset -q --hard
done

if test -z "$branch"
then
	git checkout "$original_HEAD"
else
	git checkout "${branch#refs/heads/}"
fi

${this.title}

Code Editor : rerere-train.sh