Server IP : 85.214.239.14 / Your IP : 18.223.171.83 Web Server : Apache/2.4.62 (Debian) System : Linux h2886529.stratoserver.net 4.9.0 #1 SMP Tue Jan 9 19:45:01 MSK 2024 x86_64 User : www-data ( 33) PHP Version : 7.4.18 Disable Function : pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare, MySQL : OFF | cURL : OFF | WGET : ON | Perl : ON | Python : ON | Sudo : ON | Pkexec : OFF Directory : /proc/2/cwd/usr/share/doc/git/contrib/ |
Upload File : |
#!/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