1App::Pinto::Command::meUrsgeer(3C)ontributed Perl DocumeAnptpa:t:iPoinnto::Command::merge(3)
2
3
4
6 App::Pinto::Command::merge - join two stack histories together
7
9 version 0.14
10
12 pinto --root=REPOSITORY_ROOT merge [OPTIONS] STACK [INTO_STACK]
13
15 !! THIS COMMAND IS EXPERIMENTAL !!
16
17 This command joins the history of one stack with another. At present,
18 it is only capable of doing a "fast-forward" merge when the head of
19 STACK is a direct descendant of the head of INTO_STACK.
20
22 The first mandatory argument is the name of the stack to merge from.
23 The second optional argument is the name of the stack to merge to. If
24 the second argument is not specified, it defaults to whichever stack is
25 currently marked as the default. Here are some examples:
26
27 pinto ... merge dev # Merge the "dev" stack into the default stack
28 pinto ... merge dev prod # Merge the "dev" stack into the "prod" stack
29
31 --dry-run
32 Go through all the motions, but do not actually commit any changes
33 to the repository. At the conclusion, a diff showing the changes
34 that would have been made will be displayed. Use this option to
35 see how upgrades would potentially impact the stack.
36
37 --message=TEXT
38 -m TEXT
39 Use TEXT as the revision history log message. If you do not use
40 the "--message" option or the "--use-default-message" option, then
41 you will be prompted to enter the message via your text editor.
42 Use the "PINTO_EDITOR" or "EDITOR" or "VISUAL" environment
43 variables to control which editor is used. A log message is not
44 required whenever the "--dry-run" option is set, or if the action
45 did not yield any changes to the repository.
46
47 --use-default-message
48 -M Use the default value for the revision history log message. Pinto
49 will generate a semi-informative log message just based on the
50 command and its arguments. If you set an explicit message with
51 "--message", the "--use- default-message" option will be silently
52 ignored.
53
55 Jeffrey Ryan Thalhammer <jeff@stratopan.com>
56
58 This software is copyright (c) 2015 by Jeffrey Ryan Thalhammer.
59
60 This is free software; you can redistribute it and/or modify it under
61 the same terms as the Perl 5 programming language system itself.
62
63
64
65perl v5.32.0 2020-07-28 App::Pinto::Command::merge(3)