OXIESEC PANEL
- Current Dir:
/
/
usr
/
share
/
doc
/
git
/
contrib
Server IP: 139.59.38.164
Upload:
Create Dir:
Name
Size
Modified
Perms
📁
..
-
05/09/2024 07:13:18 AM
rwxr-xr-x
📄
README
2.06 KB
05/29/2018 08:14:06 AM
rw-r--r--
📁
buildsystems
-
05/09/2024 07:13:18 AM
rwxr-xr-x
📁
coccinelle
-
05/09/2024 07:13:18 AM
rwxr-xr-x
📁
contacts
-
05/09/2024 07:13:18 AM
rwxr-xr-x
📄
convert-grafts-to-replace-refs.sh
751 bytes
05/29/2018 08:14:06 AM
rw-r--r--
📁
credential
-
10/21/2019 03:49:22 PM
rwxr-xr-x
📁
diff-highlight
-
05/09/2024 07:13:18 AM
rwxr-xr-x
📁
examples
-
05/09/2024 07:13:18 AM
rwxr-xr-x
📁
fast-import
-
05/09/2024 07:13:18 AM
rwxr-xr-x
📁
git-jump
-
05/09/2024 07:13:18 AM
rwxr-xr-x
📄
git-resurrect.sh
4.29 KB
05/29/2018 08:14:06 AM
rw-r--r--
📁
git-shell-commands
-
05/09/2024 07:13:18 AM
rwxr-xr-x
📁
hg-to-git
-
05/09/2024 07:13:18 AM
rwxr-xr-x
📁
hooks
-
05/09/2024 07:13:18 AM
rwxr-xr-x
📁
long-running-filter
-
05/09/2024 07:13:18 AM
rwxr-xr-x
📁
persistent-https
-
05/09/2024 07:13:18 AM
rwxr-xr-x
📁
remote-helpers
-
05/09/2024 07:13:18 AM
rwxr-xr-x
📄
remotes2config.sh
770 bytes
05/29/2018 08:14:06 AM
rw-r--r--
📄
rerere-train.sh
1.57 KB
05/29/2018 08:14:06 AM
rw-r--r--
📁
stats
-
05/09/2024 07:13:18 AM
rwxr-xr-x
📁
subtree
-
05/09/2024 07:13:18 AM
rwxr-xr-x
📁
svn-fe
-
05/09/2024 07:13:18 AM
rwxr-xr-x
📁
thunderbird-patch-inline
-
05/09/2024 07:13:18 AM
rwxr-xr-x
📁
update-unicode
-
05/09/2024 07:13:18 AM
rwxr-xr-x
📁
workdir
-
05/09/2024 07:13:18 AM
rwxr-xr-x
Editing: rerere-train.sh
Close
#!/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