1GIT-PSYKOREBASE(1) Git Extras GIT-PSYKOREBASE(1)
2
3
4
6 git-psykorebase - Rebase a branch with a merge commit
7
9 git-psykorebase <target_branch> [<feature_branch>] [--no-ff]
10
11 git-psykorebase --continue
12
14 Rebase the feature_branch on top of the target_branch, the fea‐
15 ture_branch defaults to the current one.
16
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
23 Rebase current branch on top of master:
24
25
26 $ git psykorebase master --no-ff
27
28
29
30 Handle conflicts:
31
32
33 $ git add README.md
34
35
36
37 Continue rebase:
38
39
40 $ git psykorebase --continue
41
42
43
45 Written by Rémy Hubscher <mailto:hubscher.remy@gmail.com>
46
47 Based on Benoît Bryon <mailto:benoit@marmelune.net> implementation in
48 Python.
49
51 <https://github.com/tj/git-extras/issues>
52
54 <https://github.com/tj/git-extras>
55
56 <https://github.com/benoitbryon/psykorebase>
57
58
59
60 March 2020 GIT-PSYKOREBASE(1)