PNG  IHDR;IDATxܻn0K )(pA 7LeG{ §㻢|ذaÆ 6lذaÆ 6lذaÆ 6lom$^yذag5bÆ 6lذaÆ 6lذa{ 6lذaÆ `}HFkm,mӪôô! x|'ܢ˟;E:9&ᶒ}{v]n&6 h_tڠ͵-ҫZ;Z$.Pkž)!o>}leQfJTu іچ\X=8Rن4`Vwl>nG^is"ms$ui?wbs[m6K4O.4%/bC%t Mז -lG6mrz2s%9s@-k9=)kB5\+͂Zsٲ Rn~GRC wIcIn7jJhۛNCS|j08yiHKֶۛkɈ+;SzL/F*\Ԕ#"5m2[S=gnaPeғL lذaÆ 6l^ḵaÆ 6lذaÆ 6lذa; _ذaÆ 6lذaÆ 6lذaÆ RIENDB` #!/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