__ __ __ __ _____ _ _ _____ _ _ _ | \/ | \ \ / / | __ \ (_) | | / ____| | | | | | \ / |_ __\ V / | |__) | __ ___ ____ _| |_ ___ | (___ | |__ ___| | | | |\/| | '__|> < | ___/ '__| \ \ / / _` | __/ _ \ \___ \| '_ \ / _ \ | | | | | | |_ / . \ | | | | | |\ V / (_| | || __/ ____) | | | | __/ | | |_| |_|_(_)_/ \_\ |_| |_| |_| \_/ \__,_|\__\___| |_____/|_| |_|\___V 2.1 if you need WebShell for Seo everyday contact me on Telegram Telegram Address : @jackleetFor_More_Tools:
#!/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 --no-gpg-sign $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 --no-pager show -s --format="Learning from %h %s" "$commit"
git rerere
git checkout -q $commit -- .
git rerere
fi
git reset -q --hard # Might nuke untracked files...
done
if test -z "$branch"
then
git checkout "$original_HEAD"
else
git checkout "${branch#refs/heads/}"
fi
| Name | Type | Size | Permission | Actions |
|---|---|---|---|---|
| buildsystems | Folder | 0755 |
|
|
| coccinelle | Folder | 0755 |
|
|
| contacts | Folder | 0755 |
|
|
| credential | Folder | 0755 |
|
|
| diff-highlight | Folder | 0755 |
|
|
| examples | Folder | 0755 |
|
|
| fast-import | Folder | 0755 |
|
|
| git-jump | Folder | 0755 |
|
|
| git-shell-commands | Folder | 0755 |
|
|
| hg-to-git | Folder | 0755 |
|
|
| hooks | Folder | 0755 |
|
|
| long-running-filter | Folder | 0755 |
|
|
| persistent-https | Folder | 0755 |
|
|
| remote-helpers | Folder | 0755 |
|
|
| stats | Folder | 0755 |
|
|
| subtree | Folder | 0755 |
|
|
| thunderbird-patch-inline | Folder | 0755 |
|
|
| update-unicode | Folder | 0755 |
|
|
| vscode | Folder | 0755 |
|
|
| workdir | Folder | 0755 |
|
|
| README | File | 2.05 KB | 0644 |
|
| coverage-diff.sh | File | 2.05 KB | 0644 |
|
| git-resurrect.sh | File | 4.25 KB | 0644 |
|
| remotes2config.sh | File | 770 B | 0644 |
|
| rerere-train.sh | File | 1.62 KB | 0644 |
|