ajout de merge2php82.sh

merge2php82.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+# -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
+mydir="$(cd "$(dirname -- "$0")"; pwd)"
+myself="$mydir/$(basename -- "$0")"
+cwd="$(pwd)"
+if [ "$mydir" == "$cwd" -o "${mydir#$cwd/}" != "$mydir" ]; then
+    cp "$myself" /tmp/merge2php82.sh
+    exec /tmp/merge2php82.sh "$mydir" "$mydir"
+else
+    nulibdir="${2:-$mydir}"
+    source "$nulibdir/load.sh" || exit 1
+fi
+
+args=(
+    "description"
+    #"usage"
+)
+parse_args "$@"; set -- "${args[@]}"
+
+projdir="${1:-.}"
+cd "$projdir" || die
+
+edebug "mydir=$mydir, nulibdir=$nulibdir, projdir=$projdir"
+
+git checkout php82
+git rebase master ||
+    die "Le rebase automatique a échoué. Après avoir résolu les conflits, faire
+    git checkout master
+    pp -af
+"
+git checkout master
+pp -af