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       git-psykorebase --continue
11

DESCRIPTION

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

OPTIONS

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

EXAMPLES

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

AUTHOR

44       Written by Rémy Hubscher <hubscher.remy@gmail.com>
45
46       Based on Benoît Bryon <benoit@marmelune.net> implementation in Python.
47

REPORTING BUGS

49       <https://github.com/tj/git-extras/issues>
50

SEE ALSO

52       <https://github.com/tj/git-extras>
53
54       <https://github.com/benoitbryon/psykorebase>
55
56
57
58                                  August 2021               GIT-PSYKOREBASE(1)