logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 1b43744f1a1297611cbec34d8e368a0dee9b4d2d
parent: ddfa778ee1e17f92bfc6702fe4d7579377b28532
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