logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: d35e5b9260d0c54a0b043dbc725b1c4033a2f7d2
parent: ffa8f6a1f6acecd4c854fd5bfee35b7343eb383a
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Tue, 16 Oct 2018 03:57:27 +0200

rebase.sh: script (legacy)

Diffstat:

Arebase.sh6++++++
1 file changed, 6 insertions(+), 0 deletions(-)

diff --git a/rebase.sh b/rebase.sh @@ -0,0 +1,6 @@ +#!/bin/sh +git checkout dev-lanodan2 +echo "[Don’t forget]: change merges to “exec git merge <branch>”" +echo "Press return to continue" +read +git rebase -pi upstream/develop