Gecko [ dataharbor.africa ]

Name	Size	Permission
?;blameview	[ DIR ]	drwxr-xr-x
?;buildsystems	[ DIR ]	drwxr-xr-x
?;ciabot	[ DIR ]	drwxr-xr-x
?;completion	[ DIR ]	drwxr-xr-x
?;continuous	[ DIR ]	drwxr-xr-x
?;convert-objects	[ DIR ]	drwxr-xr-x
?;credential	[ DIR ]	drwxr-xr-x
?;diff-highlight	[ DIR ]	drwxr-xr-x
?;diffall	[ DIR ]	drwxr-xr-x
?;emacs	[ 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
?;gitview	[ DIR ]	drwxr-xr-x
?;hg-to-git	[ DIR ]	drwxr-xr-x
?;hooks	[ DIR ]	drwxr-xr-x
?;mw-to-git	[ DIR ]	drwxr-xr-x
?;p4import	[ DIR ]	drwxr-xr-x
?;patches	[ 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
?;vim	[ DIR ]	drwxr-xr-x
?;workdir	[ DIR ]	drwxr-xr-x
README	2.06 KB	-rw-r--r--
git-resurrect.sh	4.29 KB	-rw-r--r--
remotes2config.sh	770 B	-rw-r--r--
rerere-train.sh	1009 B	-rw-r--r--

Name

Size

Permission

Action

?;blameview

[ DIR ]

drwxr-xr-x

?;buildsystems

[ DIR ]

drwxr-xr-x

?;ciabot

[ DIR ]

drwxr-xr-x

?;completion

[ DIR ]

drwxr-xr-x

?;continuous

[ DIR ]

drwxr-xr-x

?;convert-objects

[ DIR ]

drwxr-xr-x

?;credential

[ DIR ]

drwxr-xr-x

?;diff-highlight

[ DIR ]

drwxr-xr-x

?;diffall

[ DIR ]

drwxr-xr-x

?;emacs

[ 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

?;gitview

[ DIR ]

drwxr-xr-x

?;hg-to-git

[ DIR ]

drwxr-xr-x

?;hooks

[ DIR ]

drwxr-xr-x

?;mw-to-git

[ DIR ]

drwxr-xr-x

?;p4import

[ DIR ]

drwxr-xr-x

?;patches

[ 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

?;vim

[ DIR ]

drwxr-xr-x

?;workdir

[ DIR ]

drwxr-xr-x

README

2.06 KB

-rw-r--r--

git-resurrect.sh

4.29 KB

-rw-r--r--

remotes2config.sh

770 B

-rw-r--r--

rerere-train.sh

1009 B

-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="$me rev-list-args"

SUBDIRECTORY_OK=Yes
OPTIONS_SPEC=
. $(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 -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