1GIT-OCTOPUS(1)              git-octopus suit Manual             GIT-OCTOPUS(1)
2
3
4

NAME

6       git-octopus - extends git-merge with branch naming patterns.
7

SYNOPSIS

9       git octopus [-n|-c] [-s <n>] [-e <pattern>] [<pattern>...]
10       git octopus -v
11

DESCRIPTION

13       <pattern> can be any usual refspec or a naming pattern. Patterns are
14       resolved using git ls-remote, the resulting refs are given to git
15       merge.
16
17       In case of conflicts, tries to reuse conflict resolutions stored by git
18       conflict in refs/conflicts/*. (See git-conflict(1)).
19
20       In case of a merge failure, iterates over all the refs, computing
21       merges with each ref (from HEAD) one by one for diagnosic purpose.
22       Learn more about conflict management on the project’s homepage.
23

OPTIONS

25       -n
26           Leaves the repository back to HEAD.
27
28       -c
29           Commit the resulting merge in the current branch. This is the
30           default behavior unless -n or octopus.commit set to false. Use this
31           option to override the latter.
32
33       -s <n>
34           Chunk mode: the merge is performed by subsets of <n> branches. This
35           is meant to help reading the log graph when lots of branches are
36           merged.
37
38       -e <pattern>
39           Exclude pattern: the merge excludes branches matching the
40           <pattern>.
41
42       -v
43           Prints the version of git-octopus
44

EXAMPLES

46       •   Merge check of the current branch with all feature branches and the
47           master from origin:
48
49               $ git octopus -n origin/features/* origin/master
50
51           This is basically a merge check you would do before pushing your
52           branch.
53

CONFIGURATION

55       octopus.commit
56           true by default. set to false behaves like -n
57
58       octopus.pattern
59           Defines a branch naming pattern that git octopus would use by
60           default. Use multiple lines to define several patterns. See
61           git-config(1).
62
63       octopus.excludePattern
64           Defines a branch naming pattern that git octopus will exclude by
65           default.
66

SEE ALSO

68       git-merge(1), git-ls-remote(1), git-conflict(1).
69

GIT-OCTOPUS

71       Part of the git-octopus suit.
72
73
74
75git-octopus 1.4                   01/26/2021                    GIT-OCTOPUS(1)
Impressum