1GIT-PSYKOREBASE(1)                Git Extras                GIT-PSYKOREBASE(1)
2
3
4

NAME

6       git-psykorebase - Rebase a branch with a merge commit
7

SYNOPSIS

9       git-psykorebase <target_branch> [<feature_branch>] [--no-ff]
10
11       git-psykorebase --continue
12

DESCRIPTION

14       Rebase  the  feature_branch  on  top  of  the  target_branch,  the fea‐
15       ture_branch defaults to the current one.
16

OPTIONS

18       --no-ff Force a commit message even if there are no conflicts.
19
20       --continue Continue the rebase after conflicts have been resolved.
21

EXAMPLES

23       Rebase current branch on top of master:
24
25
26
27           $ git psykorebase master --no-ff
28
29
30
31       Handle conflicts:
32
33
34
35           $ git add README.md
36
37
38
39       Continue rebase:
40
41
42
43           $ git psykorebase --continue
44
45
46

AUTHOR

48       Written by Rémy Hubscher <rhubscher@mozilla.com>
49
50       Based on Benoît Bryon <benoit@marmelune.net> implementation in Python.
51

REPORTING BUGS

53       <https://github.com/tj/git-extras/issues>
54

SEE ALSO

56       <https://github.com/tj/git-extras>
57
58       <https://github.com/benoitbryon/psykorebase>
59
60
61
62                                 October 2017               GIT-PSYKOREBASE(1)